sandstone-cli 1.1.11 → 1.2.1

package/.github/workflows/npm-publish.yml

@@ -25,3 +25,7 @@ jobs:
       - run: pnpm run build && npm publish
         env:
           NPM_TOKEN: ${{secrets.npm_token}}
+      - run: sed -i 's/sandstone-cli/create-sandstone/g' package.json
+      - run: npm publish
+        env:
+          NPM_TOKEN: ${{secrets.npm_token}}

package/lib/commands/dependency.js

@@ -236,4 +236,23 @@ export async function uninstallVanillaCommand(_libraries) {
     }
     console.log(`${count} libraries removed`);
 }
-export async function refreshCommand() { }
+export async function refreshCommand() {
+    let lockFilePath = path.resolve('./resources/cache/lock-smithed.json');
+    let lockFile = false;
+    try {
+        lockFile = JSON.parse(await fs.readFile(lockFilePath, 'utf-8'));
+    }
+    catch (e) { }
+    if (lockFile) {
+        console.log('Refreshing libraries...');
+        await fs.remove(path.resolve('./resources/cache/smithed'));
+        await fs.writeFile(lockFilePath, '{}');
+        await buildCommand({
+            path: './src',
+            configPath: './'
+        });
+    }
+    else {
+        console.log('No libraries to refresh');
+    }
+}

package/lib/create.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/lib/create.js

@@ -0,0 +1,18 @@
+#!/usr/bin/env node
+import { Argument, Command } from 'commander';
+import figlet from 'figlet';
+import { createCommand } from './commands/index.js';
+import { BuildDeclares } from './shared.js';
+const commander = new Command();
+console.log(figlet.textSync('Sandstone'));
+const createCLI = commander
+    .version('1.0.0')
+    .description('Create a new Sandstone project. ⛏')
+    .action(createCommand)
+    .addArgument(new Argument('<projectName>', 'Not the name of the output pack'));
+createCLI.option.apply(createCLI, BuildDeclares.name)
+    .option.apply(createCLI, BuildDeclares.namespace)
+    .option.apply(createCLI, BuildDeclares.world)
+    .option.apply(createCLI, BuildDeclares.clientPath)
+    .option.apply(createCLI, BuildDeclares.serverPath);
+createCLI.parse(process.argv);

package/lib/index.js

@@ -2,30 +2,12 @@
 import { Argument, Command } from 'commander';
 import figlet from 'figlet';
 import { buildCommand, createCommand, watchCommand, installNativeCommand, installVanillaCommand, uninstallVanillaCommand, refreshCommand } from './commands/index.js';
+import { BuildDeclares } from './shared.js';
 const commander = new Command();
 console.log(figlet.textSync('Sandstone'));
 const CLI = commander
     .version('1.0.0')
     .description('The CLI for Sandstone - the minecraft pack creation library.');
-const BuildDeclares = {
-    // Flags
-    dry: ['-d, --dry', 'Do not save the pack. Mostly useful with `verbose`.'],
-    verbose: ['-v, --verbose', 'Log all resulting resources: functions, advancements...'],
-    root: ['-r, --root', 'Save the pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Override the value specified in the configuration file.'],
-    fullTrace: ['-t, --full-trace', 'Show the full stack trace on errors.'],
-    strictErrors: ['-s, --strict-errors', 'Stop pack compilation on type errors.'],
-    production: ['-p, --production', 'Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to "production".'],
-    // Values
-    path: ['--path <path>', 'Path of the folder containing source files.', './src'],
-    config: ['--config-path', 'Path of the sandstone.config.ts folder.', './'],
-    name: ['-n, --name <name>', 'Name of the datapack. Override the value specified in the configuration file.'],
-    namespace: ['-ns, --namespace <namespace>', 'The default namespace. Override the value specified in the configuration file.'],
-    world: ['-w, --world <name>', 'The name of the world to save the packs in. Override the value specified in the configuration file.'],
-    clientPath: ['-c, --client-path <path>', 'Path of the client folder. Override the value specified in the configuration file.'],
-    serverPath: ['--server-path <path>', 'Path of the server folder. Override the value specified in the configuration file.'],
-    // TODO: ssh
-    // TODO: reimplement auto reload
-}; // Haha TypeScript funny
 const build = CLI
     .command('build')
     .description('Build the pack(s). ⛏');
@@ -69,7 +51,6 @@ create.option.apply(create, BuildDeclares.name)
     .option.apply(create, BuildDeclares.world)
     .option.apply(create, BuildDeclares.clientPath)
     .option.apply(create, BuildDeclares.serverPath);
-// TODO
 const install = CLI
     .command('install')
     .alias('add')

package/lib/shared.d.ts

@@ -0,0 +1 @@
+export declare const BuildDeclares: Record<string, [string, string, RegExp, boolean]>;

package/lib/shared.js

@@ -0,0 +1,19 @@
+export const BuildDeclares = {
+    // Flags
+    dry: ['-d, --dry', 'Do not save the pack. Mostly useful with `verbose`.'],
+    verbose: ['-v, --verbose', 'Log all resulting resources: functions, advancements...'],
+    root: ['-r, --root', 'Save the pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Override the value specified in the configuration file.'],
+    fullTrace: ['-t, --full-trace', 'Show the full stack trace on errors.'],
+    strictErrors: ['-s, --strict-errors', 'Stop pack compilation on type errors.'],
+    production: ['-p, --production', 'Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to "production".'],
+    // Values
+    path: ['--path <path>', 'Path of the folder containing source files.', './src'],
+    config: ['--config-path', 'Path of the sandstone.config.ts folder.', './'],
+    name: ['-n, --name <name>', 'Name of the datapack. Override the value specified in the configuration file.'],
+    namespace: ['-ns, --namespace <namespace>', 'The default namespace. Override the value specified in the configuration file.'],
+    world: ['-w, --world <name>', 'The name of the world to save the packs in. Override the value specified in the configuration file.'],
+    clientPath: ['-c, --client-path <path>', 'Path of the client folder. Override the value specified in the configuration file.'],
+    serverPath: ['--server-path <path>', 'Path of the server folder. Override the value specified in the configuration file.'],
+    // TODO: ssh
+    // TODO: reimplement auto reload
+}; // Haha TypeScript funny

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "sandstone-cli",
-  "version": "1.1.11",
+  "version": "1.2.1",
   "description": "The CLI for Sandstone - the minecraft pack creation library.",
   "type": "module",
   "exports": "./lib/index.js",
   "bin": {
-    "sand": "./lib/index.js"
+    "sand": "./lib/index.js",
+    "create-sandstone": "./lib/create.js"
   },
   "scripts": {
     "test": "echo NO TESTS",

package/src/commands/dependency.ts

@@ -298,4 +298,27 @@ export async function uninstallVanillaCommand(_libraries: string[]) {
   console.log(`${count} libraries removed`)
 }
 
-export async function refreshCommand() {}
+export async function refreshCommand() {
+  let lockFilePath = path.resolve('./resources/cache/lock-smithed.json')
+
+  let lockFile: Record<string, {}> | false = false
+
+  try {
+    lockFile = JSON.parse(await fs.readFile(lockFilePath, 'utf-8'))
+  } catch (e) {}
+
+  if (lockFile) {
+    console.log('Refreshing libraries...')
+
+    await fs.remove(path.resolve('./resources/cache/smithed'))
+
+    await fs.writeFile(lockFilePath, '{}')
+
+    await buildCommand({
+      path: './src',
+      configPath: './'
+    })
+  } else {
+    console.log('No libraries to refresh')
+  }
+}

package/src/create.ts

@@ -0,0 +1,24 @@
+#!/usr/bin/env node
+import { Argument, Command } from 'commander';
+import figlet from 'figlet';
+import { createCommand } from './commands/index.js';
+import { BuildDeclares } from './shared.js';
+
+const commander = new Command()
+
+console.log(figlet.textSync('Sandstone'));
+
+const createCLI = commander
+  .version('1.0.0')
+  .description('Create a new Sandstone project. ⛏')
+  .action(createCommand)
+  .addArgument(new Argument('<projectName>', 'Not the name of the output pack'))
+
+createCLI.option.apply(createCLI, BuildDeclares.name)
+  .option.apply(createCLI, BuildDeclares.namespace)
+  .option.apply(createCLI, BuildDeclares.world)
+  .option.apply(createCLI, BuildDeclares.clientPath)
+  .option.apply(createCLI, BuildDeclares.serverPath)
+
+
+createCLI.parse(process.argv)

package/src/index.ts

@@ -2,6 +2,7 @@
 import { Argument, Command } from 'commander';
 import figlet from 'figlet';
 import { buildCommand, createCommand, watchCommand, installNativeCommand, installVanillaCommand, uninstallVanillaCommand, refreshCommand } from './commands/index.js';
+import { BuildDeclares } from './shared.js';
 
 const commander = new Command()
 
@@ -11,27 +12,6 @@ const CLI = commander
   .version('1.0.0')
   .description('The CLI for Sandstone - the minecraft pack creation library.')
 
-const BuildDeclares = {
-  // Flags
-  dry: ['-d, --dry', 'Do not save the pack. Mostly useful with `verbose`.'],
-  verbose: ['-v, --verbose', 'Log all resulting resources: functions, advancements...'],
-  root: ['-r, --root', 'Save the pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Override the value specified in the configuration file.'],
-  fullTrace: ['-t, --full-trace', 'Show the full stack trace on errors.'],
-  strictErrors: ['-s, --strict-errors', 'Stop pack compilation on type errors.'],
-  production: ['-p, --production', 'Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to "production".'],
-
-  // Values
-  path: ['--path <path>', 'Path of the folder containing source files.', './src'],
-  config: ['--config-path', 'Path of the sandstone.config.ts folder.', './'],
-  name: ['-n, --name <name>', 'Name of the datapack. Override the value specified in the configuration file.'],
-  namespace: ['-ns, --namespace <namespace>', 'The default namespace. Override the value specified in the configuration file.'],
-  world: ['-w, --world <name>', 'The name of the world to save the packs in. Override the value specified in the configuration file.'],
-  clientPath: ['-c, --client-path <path>', 'Path of the client folder. Override the value specified in the configuration file.'],
-  serverPath: ['--server-path <path>', 'Path of the server folder. Override the value specified in the configuration file.'],
-  // TODO: ssh
-  // TODO: reimplement auto reload
-} as unknown as Record<string, [string, string, RegExp, boolean]> // Haha TypeScript funny
-
 const build = CLI
   .command('build')
   .description('Build the pack(s). ⛏')
@@ -83,7 +63,6 @@ create.option.apply(create, BuildDeclares.name)
   .option.apply(create, BuildDeclares.clientPath)
   .option.apply(create, BuildDeclares.serverPath)
 
-// TODO
 const install = CLI
   .command('install')
   .alias('add')

package/src/shared.ts

@@ -0,0 +1,20 @@
+export const BuildDeclares = {
+    // Flags
+    dry: ['-d, --dry', 'Do not save the pack. Mostly useful with `verbose`.'],
+    verbose: ['-v, --verbose', 'Log all resulting resources: functions, advancements...'],
+    root: ['-r, --root', 'Save the pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Override the value specified in the configuration file.'],
+    fullTrace: ['-t, --full-trace', 'Show the full stack trace on errors.'],
+    strictErrors: ['-s, --strict-errors', 'Stop pack compilation on type errors.'],
+    production: ['-p, --production', 'Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to "production".'],
+  
+    // Values
+    path: ['--path <path>', 'Path of the folder containing source files.', './src'],
+    config: ['--config-path', 'Path of the sandstone.config.ts folder.', './'],
+    name: ['-n, --name <name>', 'Name of the datapack. Override the value specified in the configuration file.'],
+    namespace: ['-ns, --namespace <namespace>', 'The default namespace. Override the value specified in the configuration file.'],
+    world: ['-w, --world <name>', 'The name of the world to save the packs in. Override the value specified in the configuration file.'],
+    clientPath: ['-c, --client-path <path>', 'Path of the client folder. Override the value specified in the configuration file.'],
+    serverPath: ['--server-path <path>', 'Path of the server folder. Override the value specified in the configuration file.'],
+    // TODO: ssh
+    // TODO: reimplement auto reload
+  } as unknown as Record<string, [string, string, RegExp, boolean]> // Haha TypeScript funny