sandstone-cli 1.0.6 → 1.1.1

package/bin/.env.sand

@@ -0,0 +1 @@
+NODE_OPTIONS=--loader ts-node/esm

package/bin/run

@@ -0,0 +1 @@
+node ./node_modules/dotenv-cli/cli.js -e ./node_modules/sandstone-cli/bin/.env.sand node ./node_modules/sandstone-cli/lib/index.js $1

package/lib/build/index.d.ts

@@ -14,6 +14,7 @@ type BuildOptions = {
     clientPath?: string;
     serverPath?: string;
     ssh?: any;
+    dependencies?: [string, string][];
 };
 /**
  * Build the project. Will log errors and never throw any.

package/lib/build/index.js

@@ -182,6 +182,12 @@ async function _buildProject(cliOptions, { absProjectFolder, projectFolder, root
     if (error) {
         return;
     }
+    /// Add new dependencies ///
+    if (cliOptions.dependencies) {
+        for (const dependency of cliOptions.dependencies) {
+            sandstonePack.core.depend(...dependency);
+        }
+    }
     /// SAVING RESULTS ///
     // Setup the cache if it doesn't exist.
     // This cache is here to avoid writing files on disk when they did not change.
@@ -418,6 +424,7 @@ async function _buildProject(cliOptions, { absProjectFolder, projectFolder, root
     await fs.writeFile(cacheFile, JSON.stringify(cache));
     // Run the afterAll script
     await ((_g = scripts === null || scripts === void 0 ? void 0 : scripts.afterAll) === null || _g === void 0 ? void 0 : _g.call(scripts));
+    console.log(`Pack(s) compiled! View output in ./.sandstone/output/`);
 }
 /**
  * Build the project. Will log errors and never throw any.

package/lib/commands/build.d.ts

@@ -13,6 +13,7 @@ type BuildOptions = {
     clientPath?: string;
     serverPath?: string;
     ssh?: any;
+    dependencies?: [string, string][];
 };
 export declare function buildCommand(opts: BuildOptions): Promise<void>;
 export {};

package/lib/commands/dependency.d.ts

@@ -0,0 +1,5 @@
+export declare function installNativeCommand(): Promise<void>;
+export declare function installVanillaCommand(_libraries: string[]): Promise<void>;
+export declare function uninstallNativeCommand(): Promise<void>;
+export declare function uninstallVanillaCommand(_libraries: string[]): Promise<void>;
+export declare function refreshCommand(): Promise<void>;

package/lib/commands/dependency.js

@@ -0,0 +1,182 @@
+import fs from 'fs-extra';
+import path from 'path';
+import { buildCommand } from './build.js';
+import inquirer from 'inquirer';
+const _fetch = import('node-fetch');
+export async function installNativeCommand() {
+    console.log('unimplemented');
+}
+export async function installVanillaCommand(_libraries) {
+    let libraries = _libraries.map((lib) => [lib, false]);
+    let count = (libraries === null || libraries === void 0 ? void 0 : libraries.length) || 0;
+    let manifest = false;
+    try {
+        manifest = JSON.parse(await fs.readFile(path.resolve('./resources/smithed.json'), 'utf-8'));
+    }
+    catch (e) { }
+    const fetch = (await _fetch).default;
+    const base = 'https://api.smithed.dev/v2';
+    const search = async (term) => {
+        const options = [];
+        const optionColumn = [0, 0, 0];
+        for await (const { id, displayName } of await (await fetch(`${base}/packs?category=Library&sort=downloads${term ? `&search=${term}` : ''}`)).json()) {
+            const meta = await (await fetch(`${base}/packs/${id}/meta`)).json();
+            const owner = await (await fetch(`${base}/users/${meta.owner}`)).json();
+            const { display: { description } } = await (await fetch(`${base}/packs/${id}`)).json();
+            const option = {
+                id: meta.rawId,
+                name: displayName,
+                owner: owner.displayName,
+                downloads: `${meta.stats.downloads.total}`,
+                description: description,
+            };
+            if (manifest && !manifest[id] && !manifest[meta.rawId]) {
+                if (option.name.length > optionColumn[0])
+                    optionColumn[0] = option.name.length;
+                if (option.owner.length > optionColumn[1])
+                    optionColumn[1] = option.owner.length;
+                if (option.downloads.length > optionColumn[2])
+                    optionColumn[2] = option.downloads.length;
+                options.push(option);
+            }
+        }
+        const space = (index, option) => {
+            const length = optionColumn[index] - option.length;
+            let _space = '';
+            for (let i = 0; i < length; i++) {
+                _space += ' ';
+            }
+            return `${_space} - `;
+        };
+        if (options.length === 0) {
+            console.log('No results found!');
+        }
+        else {
+            const { selected } = await inquirer.prompt({
+                name: 'selected',
+                type: 'checkbox',
+                message: 'Which libraries to add?',
+                choices: options.map((option) => ({
+                    name: `${option.name}${space(0, option.name)}by ${option.owner}${space(1, option.owner)}${option.downloads} downloads${space(2, option.downloads)}${option.description}`,
+                    short: `${option.name} - by ${option.owner} - ${option.downloads} downloads - ${option.description}`,
+                    value: [option.id, true],
+                })),
+            });
+            if (selected && selected.length !== 0) {
+                libraries.push(...selected);
+                count += selected.length;
+                return true;
+            }
+        }
+        return false;
+    };
+    if (count === 0) {
+        await search();
+    }
+    if (count > 0) {
+        let adding = false;
+        for await (const [library, searched] of libraries) {
+            const version = library.includes('@') ? library.split('@')[1] : 'latest';
+            if (!manifest || !(manifest[library] || manifest[library] === version)) {
+                if (searched) {
+                    if (!adding)
+                        adding = [];
+                    adding.push([library, version]);
+                }
+                else {
+                    let exists = false;
+                    try {
+                        /* @ts-ignore */
+                        exists = (await (await fetch(`${base}/packs/${library}/meta`)).json()).statusCode !== 404;
+                    }
+                    catch (e) { }
+                    if (exists) {
+                        if (!adding)
+                            adding = [];
+                        adding.push([library, version]);
+                    }
+                    else {
+                        count--;
+                        console.log(`${library} doesn't exist! Searching...`);
+                        if (await search(library)) {
+                            if (!adding)
+                                adding = [];
+                        }
+                    }
+                }
+            }
+            else {
+                count--;
+            }
+        }
+        if (adding) {
+            await buildCommand({
+                path: './src',
+                configPath: './',
+                dependencies: adding
+            });
+        }
+    }
+    console.log;
+    console.log(`${count} libraries added`);
+}
+export async function uninstallNativeCommand() {
+    console.log('unimplemented');
+}
+export async function uninstallVanillaCommand(_libraries) {
+    const libraries = _libraries || [];
+    let count = (libraries === null || libraries === void 0 ? void 0 : libraries.length) || 0;
+    let manifestPath = path.resolve('./resources/smithed.json');
+    let manifest = false;
+    let lockFilePath = path.resolve('./resources/cache/lock-smithed.json');
+    let lockFile = false;
+    try {
+        manifest = JSON.parse(await fs.readFile(manifestPath, 'utf-8'));
+        lockFile = JSON.parse(await fs.readFile(lockFilePath, 'utf-8'));
+    }
+    catch (e) { }
+    if (manifest) {
+        if (count === 0) {
+            const { selected } = await inquirer.prompt({
+                name: 'selected',
+                type: 'checkbox',
+                message: 'Which libraries to remove?',
+                choices: Object.entries(manifest).map(([name]) => ({
+                    short: name,
+                    value: name,
+                })),
+            });
+            if (selected && selected.length !== 0) {
+                count = selected.length;
+                libraries.push(...selected);
+            }
+        }
+        if (count > 0) {
+            for await (const library of libraries) {
+                if (manifest[library]) {
+                    delete manifest[library];
+                    await fs.remove(path.resolve(`./resources/cache/smithed/${library}`));
+                    if (lockFile) {
+                        delete lockFile[library];
+                    }
+                }
+                else {
+                    count--;
+                }
+            }
+            await fs.writeFile(manifestPath, JSON.stringify(manifest));
+            if (lockFile) {
+                await fs.writeFile(lockFilePath, JSON.stringify(lockFile));
+            }
+        }
+    }
+    else {
+        console.error('error: no dependency manifest');
+    }
+    if (count === 0 && manifest) {
+        console.log('Libraries not found, installed libraries:');
+        Object.entries(manifest).forEach(([lib]) => console.log(lib));
+    }
+    console.log(`${count} libraries removed`);
+}
+export async function refreshCommand() { }

package/lib/commands/index.d.ts

@@ -1,3 +1,4 @@
 export { buildCommand } from './build.js';
 export { createCommand } from './create.js';
+export { installNativeCommand, installVanillaCommand, uninstallNativeCommand, uninstallVanillaCommand, refreshCommand } from './dependency.js';
 export { watchCommand } from './watch.js';

package/lib/commands/index.js

@@ -1,4 +1,4 @@
 export { buildCommand } from './build.js';
 export { createCommand } from './create.js';
-//export { updateCommand } from './update.js';
+export { installNativeCommand, installVanillaCommand, uninstallNativeCommand, uninstallVanillaCommand, refreshCommand } from './dependency.js';
 export { watchCommand } from './watch.js';

package/lib/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { Argument, Command } from 'commander';
 import figlet from 'figlet';
-import { buildCommand, createCommand, watchCommand } from './commands/index.js';
+import { buildCommand, createCommand, watchCommand, installNativeCommand, installVanillaCommand, uninstallVanillaCommand, refreshCommand } from './commands/index.js';
 const commander = new Command();
 console.log(figlet.textSync('Sandstone'));
 const CLI = commander
@@ -70,8 +70,30 @@ create.option.apply(create, BuildDeclares.name)
     .option.apply(create, BuildDeclares.clientPath)
     .option.apply(create, BuildDeclares.serverPath);
 // TODO
-/*CLI
-  .command('update')
-  .description('Update Sandstone & Sandstone-CLI.. ⛏')
-  .action(updateCommand)*/
+const install = CLI
+    .command('install')
+    .alias('add')
+    .alias('i')
+    .description('Install Native Sandstone or Vanilla Smithed libraries. ⛏');
+install
+    .command('native')
+    .description('Install Native Sandstone libraries. ⛏')
+    .action(installNativeCommand)
+    .addArgument(new Argument('[libraries...]', 'Optional. Libraries to install. When unlisted, a selector will appear.'));
+install
+    .command('vanilla')
+    .alias('smithed')
+    .description('Install Vanilla Smithed libraries. ⛏')
+    .action(installVanillaCommand)
+    .addArgument(new Argument('[libraries...]', 'Optional. Libraries to install. When unlisted, a selector will appear.'));
+CLI
+    .command('uninstall')
+    .alias('remove')
+    .description('Uninstall Vanilla Smithed libraries. ⛏')
+    .action(uninstallVanillaCommand)
+    .addArgument(new Argument('[libraries...]', 'Optional. Libraries to uninstall. When unlisted, a selector will appear.'));
+CLI
+    .command('refresh')
+    .description('Clear & update cached Smithed libraries. ⛏')
+    .action(refreshCommand);
 CLI.parse(process.argv);

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "sandstone-cli",
-  "version": "1.0.6",
+  "version": "1.1.1",
   "description": "The CLI for Sandstone - the minecraft pack creation library.",
   "type": "module",
   "exports": "./lib/index.js",
   "bin": {
-    "sand": "./lib/index.js"
+    "sand": "./bin/run"
   },
   "scripts": {
     "test": "echo NO TESTS",
@@ -48,11 +48,13 @@
     "chokidar": "^3.5.3",
     "commander": "^10.0.1",
     "delete-empty": "^3.0.0",
+    "dotenv-cli": "^7.3.0",
     "figlet": "^1.6.0",
     "fs-extra": "^11.1.1",
     "inquirer": "^9.2.11",
     "klaw": "^4.1.0",
     "nanoid": "^4.0.2",
+    "node-fetch": "^3.3.2",
     "pretty-error": "^4.0.0",
     "semver": "^7.5.4",
     "ts-node": "^10.9.1"

package/src/build/index.ts

@@ -21,8 +21,8 @@ type BuildOptions = {
     production?: boolean
   
     // Values
-    path: string,
-    configPath: string,
+    path: string
+    configPath: string
     name?: string
     namespace?: string
     world?: string
@@ -31,6 +31,8 @@ type BuildOptions = {
 
     // TODO: implement ssh
     ssh?: any
+
+    dependencies?: [string, string][]
 }
 
 const pe = new PrettyError()
@@ -254,6 +256,13 @@ async function _buildProject(cliOptions: BuildOptions, { absProjectFolder, proje
     return
   }
 
+  /// Add new dependencies ///
+  if (cliOptions.dependencies) {
+    for (const dependency of cliOptions.dependencies) {
+      sandstonePack.core.depend(...dependency)
+    }
+  }
+
   /// SAVING RESULTS ///
   // Setup the cache if it doesn't exist.
   // This cache is here to avoid writing files on disk when they did not change.
@@ -538,6 +547,8 @@ async function _buildProject(cliOptions: BuildOptions, { absProjectFolder, proje
 
   // Run the afterAll script
   await scripts?.afterAll?.()
+
+  console.log(`Pack(s) compiled! View output in ./.sandstone/output/`)
 }
 
 /**

package/src/commands/build.ts

@@ -24,6 +24,8 @@ type BuildOptions = {
     serverPath?: string
 
     ssh?: any,
+
+    dependencies?: [string, string][]
 }
 
 export async function buildCommand(opts: BuildOptions) {

package/src/commands/dependency.ts

@@ -0,0 +1,230 @@
+import fs from 'fs-extra'
+import path from 'path'
+import { buildCommand } from './build.js'
+import inquirer from 'inquirer'
+
+const _fetch = import('node-fetch')
+
+export async function installNativeCommand() {
+  console.log('unimplemented')
+}
+
+type SmithedSearch = { id: string, displayName: string }[]
+
+type SmithedMeta = { rawId: string, stats: { downloads: { total: number } }, owner: string }
+
+type SmithedUser = { displayName: string }
+
+type SmithedPack = { display: { description: string } }
+
+export async function installVanillaCommand(_libraries: string[]) {
+  let libraries: [string, boolean][] = _libraries.map((lib) => [lib, false])
+
+  let count = libraries?.length || 0
+
+  let manifest: Record<string, string> | false = false
+  try {
+    manifest = JSON.parse(await fs.readFile(path.resolve('./resources/smithed.json'), 'utf-8'))
+  } catch (e) {}
+
+  const fetch = (await _fetch).default
+  const base = 'https://api.smithed.dev/v2'
+
+  const search = async (term?: string) => {
+    const options = []
+
+    const optionColumn = [0, 0, 0]
+
+    for await (const { id, displayName } of (await (await fetch(`${base}/packs?category=Library&sort=downloads${term ? `&search=${term}` : ''}`)).json() as SmithedSearch)) {
+
+      const meta = await (await fetch(`${base}/packs/${id}/meta`)).json() as SmithedMeta
+      const owner = await(await fetch(`${base}/users/${meta.owner}`)).json() as SmithedUser
+      const { display: { description }} = await(await fetch(`${base}/packs/${id}`)).json() as SmithedPack
+
+      const option = {
+        id: meta.rawId,
+        name: displayName,
+        owner: owner.displayName,
+        downloads: `${meta.stats.downloads.total}`,
+        description: description,
+      }
+
+      if (manifest && !manifest[id] && !manifest[meta.rawId]) {
+        
+        if (option.name.length > optionColumn[0]) optionColumn[0] = option.name.length
+
+        if (option.owner.length > optionColumn[1]) optionColumn[1] = option.owner.length
+        
+        if (option.downloads.length > optionColumn[2]) optionColumn[2] = option.downloads.length
+
+        options.push(option)
+      }
+    }
+
+    const space = (index: number, option: string) => {
+      const length = optionColumn[index] - option.length
+
+      let _space = ''
+
+      for (let i = 0; i < length; i++) {
+        _space += ' '
+      }
+
+      return  `${_space} - `
+    }
+
+    if (options.length === 0) {
+      console.log('No results found!')
+    } else {
+      const { selected } = await inquirer.prompt({
+        name: 'selected',
+        type: 'checkbox',
+        message: 'Which libraries to add?',
+        choices: options.map((option) => ({
+          name: `${option.name}${space(0, option.name)}by ${option.owner}${space(1, option.owner)}${option.downloads} downloads${space(2, option.downloads)}${option.description}`,
+          short: `${option.name} - by ${option.owner} - ${option.downloads} downloads - ${option.description}`,
+          value: [option.id, true],
+        })),
+      }) as {
+        selected: [string, true][]
+      }
+  
+      if (selected && selected.length !== 0) {
+        libraries.push(...selected)
+  
+        count += selected.length
+  
+        return true
+      }
+    }
+    return false
+  }
+
+  if (count === 0) {
+    await search()
+  }
+
+  if (count > 0) {
+
+    let adding: [string, string][] | false = false
+
+    for await (const [library, searched] of libraries) {
+      const version = library.includes('@') ? library.split('@')[1] : 'latest'
+
+      if (!manifest || !(manifest[library] || manifest[library] === version)) {
+        if (searched) {
+          if (!adding) adding = []
+          adding.push([library, version])
+        } else {
+          let exists = false
+          try {
+            /* @ts-ignore */
+            exists = (await (await fetch(`${base}/packs/${library}/meta`)).json()).statusCode !== 404
+          } catch (e) {}
+
+          if (exists) {
+            if (!adding) adding = []
+            adding.push([library, version])
+          } else {
+            count--
+
+            console.log(`${library} doesn't exist! Searching...`)
+
+            if (await search(library)) {
+              if (!adding) adding = []
+            }
+          }
+        }
+      } else {
+        count--
+      }
+    }
+    if (adding) {
+      await buildCommand({
+        path: './src',
+        configPath: './',
+        dependencies: adding
+      })
+    }
+  }
+
+  console.log
+  console.log(`${count} libraries added`)
+}
+
+export async function uninstallNativeCommand() {
+  console.log('unimplemented')
+}
+
+export async function uninstallVanillaCommand(_libraries: string[]) {
+  const libraries = _libraries || []
+
+  let count = libraries?.length || 0
+
+  let manifestPath = path.resolve('./resources/smithed.json')
+
+  let manifest: Record<string, string> | false = false
+
+  let lockFilePath = path.resolve('./resources/cache/lock-smithed.json')
+
+  let lockFile: Record<string, {}> | false = false
+
+  try {
+    manifest = JSON.parse(await fs.readFile(manifestPath, 'utf-8'))
+    lockFile = JSON.parse(await fs.readFile(lockFilePath, 'utf-8'))
+  } catch (e) {}
+
+  if (manifest) {
+    if (count === 0) {
+      const { selected } = await inquirer.prompt({
+        name: 'selected',
+        type: 'checkbox',
+        message: 'Which libraries to remove?',
+        choices: Object.entries(manifest).map(([name]) => ({
+          short: name,
+          value: name,
+        })),
+      }) as {
+        selected: string[]
+      }
+
+      if (selected && selected.length !== 0) {
+        count = selected.length
+
+        libraries.push(...selected)
+      }
+    }
+  
+    if (count > 0) {
+      for await (const library of libraries) {
+        if (manifest[library]) {
+          delete manifest[library]
+
+          await fs.remove(path.resolve(`./resources/cache/smithed/${library}`))
+
+          if (lockFile) {
+            delete lockFile[library]
+          }
+        } else {
+          count--
+        }
+      }
+      await fs.writeFile(manifestPath, JSON.stringify(manifest))
+
+      if (lockFile) {
+        await fs.writeFile(lockFilePath, JSON.stringify(lockFile))
+      }
+    } 
+  } else {
+    console.error('error: no dependency manifest')
+  }
+
+  if (count === 0 && manifest) {
+    console.log('Libraries not found, installed libraries:')
+    Object.entries(manifest).forEach(([lib]) => console.log(lib))
+  }
+
+  console.log(`${count} libraries removed`)
+}
+
+export async function refreshCommand() {}

package/src/commands/index.ts

@@ -1,4 +1,4 @@
 export { buildCommand } from './build.js';
 export { createCommand } from './create.js';
-//export { updateCommand } from './update.js';
+export { installNativeCommand, installVanillaCommand, uninstallNativeCommand, uninstallVanillaCommand, refreshCommand } from './dependency.js'
 export { watchCommand } from './watch.js';

package/src/index.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { Argument, Command } from 'commander';
 import figlet from 'figlet';
-import { buildCommand, createCommand, watchCommand } from './commands/index.js';
+import { buildCommand, createCommand, watchCommand, installNativeCommand, installVanillaCommand, uninstallNativeCommand, uninstallVanillaCommand, refreshCommand } from './commands/index.js';
 
 const commander = new Command()
 
@@ -84,10 +84,34 @@ create.option.apply(create, BuildDeclares.name)
   .option.apply(create, BuildDeclares.serverPath)
 
 // TODO
-/*CLI
-  .command('update')
-  .description('Update Sandstone & Sandstone-CLI.. ⛏')
-  .action(updateCommand)*/
+const install = CLI
+  .command('install')
+  .alias('add')
+  .alias('i')
+  .description('Install Native Sandstone or Vanilla Smithed libraries. ⛏')
+install
+  .command('native')
+  .description('Install Native Sandstone libraries. ⛏')
+  .action(installNativeCommand)
+  .addArgument(new Argument('[libraries...]', 'Optional. Libraries to install. When unlisted, a selector will appear.'))
+install
+  .command('vanilla')
+  .alias('smithed')
+  .description('Install Vanilla Smithed libraries. ⛏')
+  .action(installVanillaCommand)
+  .addArgument(new Argument('[libraries...]', 'Optional. Libraries to install. When unlisted, a selector will appear.'))
+
+CLI
+  .command('uninstall')
+  .alias('remove')
+  .description('Uninstall Vanilla Smithed libraries. ⛏')
+  .action(uninstallVanillaCommand)
+  .addArgument(new Argument('[libraries...]', 'Optional. Libraries to uninstall. When unlisted, a selector will appear.'))
+
+CLI
+  .command('refresh')
+  .description('Clear & update cached Smithed libraries. ⛏')
+  .action(refreshCommand)
 
 
 CLI.parse(process.argv)

package/tsconfig.json

@@ -9,6 +9,7 @@
     "lib": [
       "es2020"
     ],
+    "skipLibCheck": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true
   },