sandstone-cli 0.6.1 → 0.6.2

package/README.md

@@ -19,7 +19,7 @@ $ npm install -g sandstone-cli
 $ sand COMMAND
 running command...
 $ sand (-v|--version|version)
-sandstone-cli/0.6.1 linux-x64 node-v16.19.0
+sandstone-cli/0.6.2 linux-x64 node-v16.19.1
 $ sand --help [COMMAND]
 USAGE
   $ sand COMMAND
@@ -84,7 +84,7 @@ EXAMPLES
   $ sand build --verbose --dry
 ```
 
-_See code: [src/commands/build.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.1/src/commands/build.ts)_
+_See code: [src/commands/build.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.2/src/commands/build.ts)_
 
 ## `sand create PROJECT-NAME`
 
@@ -118,7 +118,7 @@ EXAMPLE
   $ sand create my-pack
 ```
 
-_See code: [src/commands/create.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.1/src/commands/create.ts)_
+_See code: [src/commands/create.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.2/src/commands/create.ts)_
 
 ## `sand help [COMMAND]`
 
@@ -160,7 +160,7 @@ EXAMPLES
   $ sand update --cli --sandstone --skip
 ```
 
-_See code: [src/commands/update.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.1/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.2/src/commands/update.ts)_
 
 ## `sand watch PATH CONFIG-PATH`
 
@@ -212,5 +212,5 @@ EXAMPLES
   $ sand watch --verbose --dry
 ```
 
-_See code: [src/commands/watch.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.1/src/commands/watch.ts)_
+_See code: [src/commands/watch.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.2/src/commands/watch.ts)_
 <!-- commandsstop -->

package/lib/build/buildProject.d.ts

@@ -23,4 +23,4 @@ export declare type BuildOptions = {
  *
  * @param changedFiles The files that changed since the last build.
  */
-export declare function buildProject(options: BuildOptions, folders: ProjectFolders, resourceTypes: string[], changedFiles?: string[]): Promise<void>;
+export declare function buildProject(options: BuildOptions, folders: ProjectFolders, changedFiles?: string[]): Promise<void>;

package/lib/build/buildProject.js

@@ -34,6 +34,7 @@ const madge_1 = __importDefault(require("madge"));
 const graph_1 = require("./graph");
 const chalk_1 = __importDefault(require("chalk"));
 const adm_zip_1 = __importDefault(require("adm-zip"));
+const delete_empty_1 = __importDefault(require("delete-empty"));
 const pe = new pretty_error_1.default();
 // Return the hash of a string
 function hash(stringToHash) {
@@ -54,7 +55,7 @@ async function mkDir(dirPath) {
         // Directory already exists
     }
 }
-let cache = {};
+let cache;
 const dependenciesCache = new graph_1.DependencyGraph({});
 const fileResources = new Map();
 function getNewModules(dependenciesGraph, rawFiles, projectFolder) {
@@ -79,7 +80,7 @@ function diffMap(map1, map2) {
     return new Map([...map1.entries()].filter(([key, value]) => !map2.has(key)));
 }
 function diffResources(tree1, tree2) {
-    return tree1.diff(tree2);
+    return diffSet(tree1, tree2);
 }
 /**
  *
@@ -131,8 +132,8 @@ async function getClientPath() {
  *
  * @param projectFolder The folder of the project. It needs a sandstone.config.ts, and it or one of its parent needs a package.json.
  */
-async function _buildProject(cliOptions, { absProjectFolder, rootFolder, sandstoneConfigFolder }, resourceTypes, changedFiles) {
-    var _a, _b, _c, _d, _e;
+async function _buildProject(cliOptions, { absProjectFolder, rootFolder, sandstoneConfigFolder }, changedFiles) {
+    var _a, _b, _c, _d, _e, _f, _g;
     const sandstoneLocation = path_1.default.join(rootFolder, 'node_modules/sandstone/');
     // First, read sandstone.config.ts to get all properties
     const sandstoneConfig = require(path_1.default.join(sandstoneConfigFolder, 'sandstone.config.ts')).default;
@@ -183,6 +184,7 @@ async function _buildProject(cliOptions, { absProjectFolder, rootFolder, sandsto
     else {
         process.env.SANDSTONE_ENV = 'development';
     }
+    process.env.WORKING_DIR = absProjectFolder;
     if (sandstoneConfig.packUid) {
         process.env.PACK_UID = sandstoneConfig.packUid;
     }
@@ -193,13 +195,8 @@ async function _buildProject(cliOptions, { absProjectFolder, rootFolder, sandsto
     }
     const { onConflict } = sandstoneConfig;
     if (onConflict) {
-        if (onConflict.default) {
-            process.env[`GENERAL_CONFLICT_STRATEGY`] = onConflict.default;
-        }
-        for (const resource of resourceTypes) {
-            if (onConflict[resource]) {
-                process.env[`${resource.toUpperCase()}_CONFLICT_STRATEGY`] = onConflict[resource];
-            }
+        for (const resource of Object.entries(onConflict)) {
+            process.env[`${resource[0].toUpperCase()}_CONFLICT_STRATEGY`] = resource[1];
         }
     }
     // JSON indentation
@@ -296,40 +293,115 @@ async function _buildProject(cliOptions, { absProjectFolder, rootFolder, sandsto
     // Setup the cache if it doesn't exist.
     // This cache is here to avoid writing files on disk when they did not change.
     const newCache = {};
+    const cacheFile = path_1.default.join(rootFolder, '.sandstone', 'cache.json');
     if (cache === undefined) {
-        cache = {};
+        let oldCache;
+        try {
+            const fileRead = await fs_extra_1.default.readFile(cacheFile, 'utf8');
+            if (fileRead) {
+                oldCache = JSON.parse(fileRead);
+            }
+        }
+        catch { }
+        if (oldCache) {
+            cache = oldCache;
+        }
+        else {
+            cache = {};
+        }
     }
     // Save the pack
     // Run the beforeSave script (TODO: This is where sandstone-server will remove restart env vars)
     await ((_c = scripts === null || scripts === void 0 ? void 0 : scripts.beforeSave) === null || _c === void 0 ? void 0 : _c.call(scripts));
+    const excludeOption = (_d = saveOptions.resources) === null || _d === void 0 ? void 0 : _d.exclude;
+    const fileExclusions = excludeOption ? {
+        generated: (excludeOption.generated || excludeOption),
+        existing: (excludeOption.existing || excludeOption)
+    } : false;
+    const fileHandlers = ((_e = saveOptions.resources) === null || _e === void 0 ? void 0 : _e.handle) || false;
     const packTypes = await sandstonePack.save({
         // Additional parameters
-        dryRun: cliOptions.dry,
+        dry: cliOptions.dry,
         verbose: cliOptions.verbose,
-        fileHandler: (_d = saveOptions.customFileHandler) !== null && _d !== void 0 ? _d : (async ({ relativePath, content, contentSummary }) => {
-            // We hash the relative path alongside the content to ensure unique hash.
-            const hashValue = hash(contentSummary + relativePath);
-            // Add to new cache.
-            newCache[relativePath] = hashValue;
-            if (cache[relativePath] === hashValue) {
-                // Already in cache - skip
-                return;
+        fileHandler: (_f = saveOptions.customFileHandler) !== null && _f !== void 0 ? _f : (async (relativePath, content) => {
+            let pathPass = true;
+            if (fileExclusions && fileExclusions.generated) {
+                for (const exclude of fileExclusions.generated) {
+                    if (!Array.isArray(exclude)) {
+                        pathPass = !exclude.test(relativePath);
+                    }
+                }
+            }
+            if (fileHandlers) {
+                for (const handler of fileHandlers) {
+                    if (handler.path.test(relativePath)) {
+                        content = await handler.callback(content);
+                    }
+                }
+            }
+            if (pathPass) {
+                // We hash the relative path alongside the content to ensure unique hash.
+                const hashValue = hash(content + relativePath);
+                // Add to new cache.
+                newCache[relativePath] = hashValue;
+                if (cache[relativePath] === hashValue) {
+                    // Already in cache - skip
+                    return;
+                }
+                // Not in cache: write to disk
+                const realPath = path_1.default.join(outputFolder, relativePath);
+                await mkDir(path_1.default.dirname(realPath));
+                return await fs_extra_1.default.writeFile(realPath, content);
             }
-            // Not in cache: write to disk
-            const realPath = path_1.default.join(rootFolder, relativePath);
-            await mkDir(path_1.default.dirname(realPath));
-            return await fs_extra_1.default.writeFile(realPath, content);
         })
     });
-    async function archiveOutput(packType, outputPath) {
+    async function handleResources(packType) {
+        const working = path_1.default.join(rootFolder, 'resources', packType);
+        for await (const file of (0, klaw_1.default)(path_1.default.join(rootFolder, 'resources', packType), { filter: (_path) => {
+                const relativePath = path_1.default.join(packType, _path.split(working)[1]);
+                let pathPass = true;
+                if (fileExclusions && fileExclusions.existing) {
+                    for (const exclude of fileExclusions.existing) {
+                        pathPass = Array.isArray(exclude) ? !exclude[0].test(relativePath) : !exclude.test(relativePath);
+                    }
+                }
+                return pathPass;
+            } })) {
+            const relativePath = path_1.default.join(packType, file.path.split(working)[1]);
+            try {
+                let content = await fs_extra_1.default.readFile(file.path);
+                if (fileHandlers) {
+                    for (const handler of fileHandlers) {
+                        if (handler.path.test(relativePath)) {
+                            content = await handler.callback(content);
+                        }
+                    }
+                }
+                // We hash the relative path alongside the content to ensure unique hash.
+                const hashValue = hash(content + relativePath);
+                // Add to new cache.
+                newCache[relativePath] = hashValue;
+                if (cache[relativePath] !== hashValue) {
+                    // Not in cache: write to disk
+                    const realPath = path_1.default.join(outputFolder, relativePath);
+                    await mkDir(path_1.default.dirname(realPath));
+                    await fs_extra_1.default.writeFile(realPath, content);
+                }
+            }
+            catch (e) { }
+        }
+    }
+    async function archiveOutput(packType) {
+        const outputPath = path_1.default.join(rootFolder, '.sandstone/output/archives', `${packName}_${packType.type}`);
         const archive = new adm_zip_1.default();
         await archive.addLocalFolderPromise(outputPath, {});
         await archive.writeZipPromise(`${outputPath}.zip`, { overwrite: true });
     }
     // TODO: implement linking to make the cache more useful when not archiving.
     if (!cliOptions.production) {
-        for (const packType of packTypes) {
-            const outputPath = path_1.default.join(rootFolder, '.sandstone/output/archives', `${packName}_${packType.type}`);
+        for await (const _packType of packTypes) {
+            const packType = _packType[1];
+            const outputPath = path_1.default.join(rootFolder, '.sandstone/output', packType.type);
             if (packType.handleOutput) {
                 await packType.handleOutput('output', async (relativePath, encoding = 'utf8') => await fs_extra_1.default.readFile(path_1.default.join(outputPath, relativePath), encoding), async (relativePath, contents) => {
                     if (contents === undefined) {
@@ -340,8 +412,9 @@ async function _buildProject(cliOptions, { absProjectFolder, rootFolder, sandsto
                     }
                 });
             }
+            handleResources(packType.type);
             if (packType.archiveOutput) {
-                archiveOutput(packType, outputPath);
+                archiveOutput(packType);
             }
             // Handle client
             if (!(server && packType.networkSides === 'server')) {
@@ -405,7 +478,7 @@ async function _buildProject(cliOptions, { absProjectFolder, rootFolder, sandsto
         }
     }
     else {
-        for (const packType of packTypes) {
+        for await (const packType of packTypes) {
             const outputPath = path_1.default.join(rootFolder, '.sandstone/output/archives', `${packName}_${packType.type}`);
             if (packType.handleOutput) {
                 await packType.handleOutput('output', async (relativePath, encoding = 'utf8') => await fs_extra_1.default.readFile(path_1.default.join(outputPath, relativePath), encoding), async (relativePath, contents) => {
@@ -417,19 +490,25 @@ async function _buildProject(cliOptions, { absProjectFolder, rootFolder, sandsto
                     }
                 });
             }
+            handleResources(packType.type);
             if (packType.archiveOutput) {
-                archiveOutput(packType, outputPath);
+                archiveOutput(packType);
             }
         }
     }
     // Delete old files that aren't cached anymore
     const oldFilesNames = new Set(Object.keys(cache));
     Object.keys(newCache).forEach(name => oldFilesNames.delete(name));
-    await Promise.allSettled([...oldFilesNames.values()].map(name => (0, util_1.promisify)(fs_extra_1.default.rm)(path_1.default.join(outputFolder, name))));
+    await Promise.allSettled([...oldFilesNames.values()].map(name => {
+        return (0, util_1.promisify)(fs_extra_1.default.rm)(path_1.default.join(outputFolder, name));
+    }));
+    await (0, delete_empty_1.default)(outputFolder);
     // Override old cache
     cache = newCache;
+    // Write the cache to disk
+    await fs_extra_1.default.writeFile(cacheFile, JSON.stringify(cache));
     // Run the afterAll script
-    await ((_e = scripts === null || scripts === void 0 ? void 0 : scripts.afterAll) === null || _e === void 0 ? void 0 : _e.call(scripts));
+    await ((_g = scripts === null || scripts === void 0 ? void 0 : scripts.afterAll) === null || _g === void 0 ? void 0 : _g.call(scripts));
 }
 /**
  * Build the project. Will log errors and never throw any.
@@ -440,12 +519,12 @@ async function _buildProject(cliOptions, { absProjectFolder, rootFolder, sandsto
  *
  * @param changedFiles The files that changed since the last build.
  */
-async function buildProject(options, folders, resourceTypes, changedFiles) {
+async function buildProject(options, folders, changedFiles) {
     try {
-        await _buildProject(options, folders, resourceTypes, changedFiles);
+        await _buildProject(options, folders, changedFiles);
     }
     catch (err) {
-        logError(err);
+        console.log(err);
     }
 }
 exports.buildProject = buildProject;
@@ -454,6 +533,7 @@ function logError(err, file) {
         if (file) {
             console.error('  ' + chalk_1.default.bgRed.white('BuildError') + chalk_1.default.gray(':'), `While loading "${file}", the following error happened:\n`);
         }
+        debugger;
         console.error(pe.render(err));
     }
 }

package/lib/commands/build.js

@@ -18,7 +18,7 @@ class Build extends command_1.Command {
             transpileOnly: !flags.strictErrors,
             project: tsConfigPath,
         });
-        (0, buildProject_1.buildProject)(flags, folders, utils_1.datapackResources);
+        (0, buildProject_1.buildProject)(flags, folders);
     }
 }
 exports.default = Build;

package/lib/commands/create.js

@@ -129,7 +129,7 @@ class Create extends command_1.Command {
         const templateFolder = path_1.default.join(__dirname, '../template/');
         await fs_extra_1.default.copy(templateFolder, projectPath);
         // Write the sandstone.json file
-        fs_1.default.writeFileSync(path_1.default.join(projectPath, 'sandstone.config.ts'), `import type { SandstoneConfig } from 'sandstone'
+        fs_1.default.writeFileSync(path_1.default.join(projectPath, 'sandstone.config.ts'), `import type { DatapackConfig, SandstoneConfig } from 'sandstone'
 
 export default {
   name: ${toJson(packName)},
@@ -137,7 +137,7 @@ export default {
     datapack: {
       description: ${toJson(['A ', { text: 'Sandstone', color: 'gold' }, ' data pack.'])},
       packFormat: ${11},
-    }
+    } as DatapackConfig
   },
   namespace: ${toJson(namespace)},
   packUid: ${toJson((0, nanoid_1.nanoid)(8))},

package/lib/commands/watch.js

@@ -37,7 +37,7 @@ class Watch extends command_1.Command {
                 return;
             }
             alreadyBuilding = true;
-            await (0, buildProject_1.buildProject)(flags, folders, utils_1.datapackResources, paths);
+            await (0, buildProject_1.buildProject)(flags, folders, paths);
             client === null || client === void 0 ? void 0 : client.write('chat', { message: '/reload' });
             alreadyBuilding = false;
             if (needRebuild) {

package/lib/utils.d.ts

@@ -28,4 +28,3 @@ export declare type ProjectFolders = {
     sandstoneConfigFolder: string;
 };
 export declare function getProjectFolders(projectFolder: string): ProjectFolders;
-export declare const datapackResources: string[];

package/lib/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.datapackResources = exports.getProjectFolders = exports.getFileFolder = exports.getWorldPath = exports.getWorldsList = exports.getMinecraftPath = exports.hasYarn = exports.getFlagOrPrompt = void 0;
+exports.getProjectFolders = exports.getFileFolder = exports.getWorldPath = exports.getWorldsList = exports.getMinecraftPath = exports.hasYarn = exports.getFlagOrPrompt = void 0;
 const inquirer_1 = __importDefault(require("inquirer"));
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
@@ -119,4 +119,3 @@ function getProjectFolders(projectFolder) {
     };
 }
 exports.getProjectFolders = getProjectFolders;
-exports.datapackResources = ['mcfunction', 'advancement', 'item_modifier', 'loot_table', 'predicate', 'recipe', 'tag', 'trim_material', 'trim_pattern'];

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.6.1","commands":{"build":{"id":"build","description":"Build the packs. ⛏","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand build","$ sand build --verbose","$ sand build --verbose --dry"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"dry":{"name":"dry","type":"boolean","char":"d","description":"Do not save the pack. Mostly useful with `verbose`.","allowNo":false},"verbose":{"name":"verbose","type":"boolean","char":"v","description":"Log all resulting resources: functions, advancements...","allowNo":false},"namespace":{"name":"namespace","type":"option","description":"The default namespace. Override the value specified in the configuration file."},"world":{"name":"world","type":"option","description":"The world to save the data pack in. Override the value specified in the configuration file."},"root":{"name":"root","type":"boolean","description":"Save the data pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Override the value specified in the configuration file.","allowNo":false},"clientPath":{"name":"clientPath","type":"option","description":"Path of the client folder. Override the value specified in the configuration file."},"serverPath":{"name":"serverPath","type":"option","description":"Path of the server folder. Override the value specified in the configuration file."},"name":{"name":"name","type":"option","description":"Name of the data pack. Override the value specified in the configuration file."},"description":{"name":"description","type":"option","description":"Description of the data pack. Override the value specified in the configuration file."},"formatVersion":{"name":"formatVersion","type":"option","description":"Pack format version. Override the value specified in the configuration file."},"fullTrace":{"name":"fullTrace","type":"boolean","description":"Show the full stack trace on errors.","allowNo":false},"strictErrors":{"name":"strictErrors","type":"boolean","description":"Stop data pack compilation on type errors.","allowNo":false},"production":{"name":"production","type":"boolean","char":"p","description":"Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to \"production\".","allowNo":false},"autoReload":{"name":"autoReload","type":"option","description":"Automatically reload your data pack in-game. Requires to open the world to LAN with cheats enabled, and to specify the port.","helpValue":"port"}},"args":[{"name":"path","description":"Path of the folder containing source files.","required":true,"default":"./src"},{"name":"config-path","description":"Path of the sandstone.config.ts folder.","required":true,"default":"."}]},"create":{"id":"create","description":"Create a new Sandstone project.","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand create my-pack"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"yarn":{"name":"yarn","type":"boolean","description":"Use yarn instead of npm.","allowNo":false},"npm":{"name":"npm","type":"boolean","description":"Use npm.","allowNo":false},"pack-name":{"name":"pack-name","type":"option","char":"d","description":"The name of the data pack."},"namespace":{"name":"namespace","type":"option","char":"n","description":"The default namespace that will be used."},"save-root":{"name":"save-root","type":"boolean","char":"r","description":"Save the data pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Not compatible with --world.","allowNo":false},"world":{"name":"world","type":"option","char":"w","description":"The world to save the packs in. Not compatible with --save-root or --server"},"server-path":{"name":"server-path","type":"option","char":"s","description":"The server path to write the server-side packs at. Not compatible with --world."},"client-path":{"name":"client-path","type":"option","char":"c","description":"The client path to write packs at."}},"args":[{"name":"project-name","description":"Name of the project folder. This is not the name of the data pack.","required":true}]},"update":{"id":"update","description":"Update Sandstone & Sandstone-CLI.","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand update","$ sand update --cli","$ sand update --sandstone","$ sand update --cli --sandstone --skip"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"cli":{"name":"cli","type":"boolean","description":"Update the Sandstone CLI without asking.","allowNo":false},"sandstone":{"name":"sandstone","type":"boolean","description":"Update the current Sandstone version without asking.","allowNo":false},"skip":{"name":"skip","type":"boolean","description":"Skip all interactive prompts and refuse them.","allowNo":false},"yarn":{"name":"yarn","type":"boolean","description":"Use yarn to install the updates.","allowNo":false},"npm":{"name":"npm","type":"boolean","description":"Use npm to install the updates.","allowNo":false}},"args":[]},"watch":{"id":"watch","description":"Build the packs, and rebuild them on file change. ⛏","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand watch","$ sand watch --verbose","$ sand watch --verbose --dry"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"dry":{"name":"dry","type":"boolean","char":"d","description":"Do not save the pack. Mostly useful with `verbose`.","allowNo":false},"verbose":{"name":"verbose","type":"boolean","char":"v","description":"Log all resulting resources: functions, advancements...","allowNo":false},"namespace":{"name":"namespace","type":"option","description":"The default namespace. Override the value specified in the configuration file."},"world":{"name":"world","type":"option","description":"The world to save the data pack in. Override the value specified in the configuration file."},"root":{"name":"root","type":"boolean","description":"Save the data pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Override the value specified in the configuration file.","allowNo":false},"clientPath":{"name":"clientPath","type":"option","description":"Path of the client folder. Override the value specified in the configuration file."},"serverPath":{"name":"serverPath","type":"option","description":"Path of the server folder. Override the value specified in the configuration file."},"name":{"name":"name","type":"option","description":"Name of the data pack. Override the value specified in the configuration file."},"description":{"name":"description","type":"option","description":"Description of the data pack. Override the value specified in the configuration file."},"formatVersion":{"name":"formatVersion","type":"option","description":"Pack format version. Override the value specified in the configuration file."},"fullTrace":{"name":"fullTrace","type":"boolean","description":"Show the full stack trace on errors.","allowNo":false},"strictErrors":{"name":"strictErrors","type":"boolean","description":"Stop data pack compilation on type errors.","allowNo":false},"production":{"name":"production","type":"boolean","char":"p","description":"Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to \"production\".","allowNo":false},"autoReload":{"name":"autoReload","type":"option","description":"Automatically reload your data pack in-game. Requires to open the world to LAN with cheats enabled, and to specify the port.","helpValue":"port"}},"args":[{"name":"path","description":"Path of the folder containing source files.","required":true,"default":"./src"},{"name":"config-path","description":"Path of the sandstone.config.ts folder.","required":true,"default":"."}]}}}
+{"version":"0.6.2","commands":{"build":{"id":"build","description":"Build the packs. ⛏","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand build","$ sand build --verbose","$ sand build --verbose --dry"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"dry":{"name":"dry","type":"boolean","char":"d","description":"Do not save the pack. Mostly useful with `verbose`.","allowNo":false},"verbose":{"name":"verbose","type":"boolean","char":"v","description":"Log all resulting resources: functions, advancements...","allowNo":false},"namespace":{"name":"namespace","type":"option","description":"The default namespace. Override the value specified in the configuration file."},"world":{"name":"world","type":"option","description":"The world to save the data pack in. Override the value specified in the configuration file."},"root":{"name":"root","type":"boolean","description":"Save the data pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Override the value specified in the configuration file.","allowNo":false},"clientPath":{"name":"clientPath","type":"option","description":"Path of the client folder. Override the value specified in the configuration file."},"serverPath":{"name":"serverPath","type":"option","description":"Path of the server folder. Override the value specified in the configuration file."},"name":{"name":"name","type":"option","description":"Name of the data pack. Override the value specified in the configuration file."},"description":{"name":"description","type":"option","description":"Description of the data pack. Override the value specified in the configuration file."},"formatVersion":{"name":"formatVersion","type":"option","description":"Pack format version. Override the value specified in the configuration file."},"fullTrace":{"name":"fullTrace","type":"boolean","description":"Show the full stack trace on errors.","allowNo":false},"strictErrors":{"name":"strictErrors","type":"boolean","description":"Stop data pack compilation on type errors.","allowNo":false},"production":{"name":"production","type":"boolean","char":"p","description":"Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to \"production\".","allowNo":false},"autoReload":{"name":"autoReload","type":"option","description":"Automatically reload your data pack in-game. Requires to open the world to LAN with cheats enabled, and to specify the port.","helpValue":"port"}},"args":[{"name":"path","description":"Path of the folder containing source files.","required":true,"default":"./src"},{"name":"config-path","description":"Path of the sandstone.config.ts folder.","required":true,"default":"."}]},"create":{"id":"create","description":"Create a new Sandstone project.","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand create my-pack"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"yarn":{"name":"yarn","type":"boolean","description":"Use yarn instead of npm.","allowNo":false},"npm":{"name":"npm","type":"boolean","description":"Use npm.","allowNo":false},"pack-name":{"name":"pack-name","type":"option","char":"d","description":"The name of the data pack."},"namespace":{"name":"namespace","type":"option","char":"n","description":"The default namespace that will be used."},"save-root":{"name":"save-root","type":"boolean","char":"r","description":"Save the data pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Not compatible with --world.","allowNo":false},"world":{"name":"world","type":"option","char":"w","description":"The world to save the packs in. Not compatible with --save-root or --server"},"server-path":{"name":"server-path","type":"option","char":"s","description":"The server path to write the server-side packs at. Not compatible with --world."},"client-path":{"name":"client-path","type":"option","char":"c","description":"The client path to write packs at."}},"args":[{"name":"project-name","description":"Name of the project folder. This is not the name of the data pack.","required":true}]},"update":{"id":"update","description":"Update Sandstone & Sandstone-CLI.","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand update","$ sand update --cli","$ sand update --sandstone","$ sand update --cli --sandstone --skip"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"cli":{"name":"cli","type":"boolean","description":"Update the Sandstone CLI without asking.","allowNo":false},"sandstone":{"name":"sandstone","type":"boolean","description":"Update the current Sandstone version without asking.","allowNo":false},"skip":{"name":"skip","type":"boolean","description":"Skip all interactive prompts and refuse them.","allowNo":false},"yarn":{"name":"yarn","type":"boolean","description":"Use yarn to install the updates.","allowNo":false},"npm":{"name":"npm","type":"boolean","description":"Use npm to install the updates.","allowNo":false}},"args":[]},"watch":{"id":"watch","description":"Build the packs, and rebuild them on file change. ⛏","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand watch","$ sand watch --verbose","$ sand watch --verbose --dry"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"dry":{"name":"dry","type":"boolean","char":"d","description":"Do not save the pack. Mostly useful with `verbose`.","allowNo":false},"verbose":{"name":"verbose","type":"boolean","char":"v","description":"Log all resulting resources: functions, advancements...","allowNo":false},"namespace":{"name":"namespace","type":"option","description":"The default namespace. Override the value specified in the configuration file."},"world":{"name":"world","type":"option","description":"The world to save the data pack in. Override the value specified in the configuration file."},"root":{"name":"root","type":"boolean","description":"Save the data pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Override the value specified in the configuration file.","allowNo":false},"clientPath":{"name":"clientPath","type":"option","description":"Path of the client folder. Override the value specified in the configuration file."},"serverPath":{"name":"serverPath","type":"option","description":"Path of the server folder. Override the value specified in the configuration file."},"name":{"name":"name","type":"option","description":"Name of the data pack. Override the value specified in the configuration file."},"description":{"name":"description","type":"option","description":"Description of the data pack. Override the value specified in the configuration file."},"formatVersion":{"name":"formatVersion","type":"option","description":"Pack format version. Override the value specified in the configuration file."},"fullTrace":{"name":"fullTrace","type":"boolean","description":"Show the full stack trace on errors.","allowNo":false},"strictErrors":{"name":"strictErrors","type":"boolean","description":"Stop data pack compilation on type errors.","allowNo":false},"production":{"name":"production","type":"boolean","char":"p","description":"Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to \"production\".","allowNo":false},"autoReload":{"name":"autoReload","type":"option","description":"Automatically reload your data pack in-game. Requires to open the world to LAN with cheats enabled, and to specify the port.","helpValue":"port"}},"args":[{"name":"path","description":"Path of the folder containing source files.","required":true,"default":"./src"},{"name":"config-path","description":"Path of the sandstone.config.ts folder.","required":true,"default":"."}]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sandstone-cli",
   "description": "The CLI for Sandstone - the data pack creation library.",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "contributors": [
     {
       "name": "TheMrZZ - Florian ERNST",
@@ -23,11 +23,13 @@
     "@oclif/plugin-help": "^3",
     "@oclif/plugin-warn-if-update-available": "^1.7.0",
     "@types/adm-zip": "^0.5.0",
-    "@types/node": "^18.11.18",
+    "@types/delete-empty": "^3.0.2",
+    "@types/node": "^18.14.0",
     "@types/semver": "^7.3.4",
     "adm-zip": "^0.5.10",
     "chalk": "^4.1.0",
     "chokidar": "^3.4.3",
+    "delete-empty": "^3.0.0",
     "fs-extra": "^9.0.1",
     "inquirer": "^7.3.3",
     "klaw": "^3.0.0",