sandstone-cli 1.1.8 → 1.1.10

package/lib/commands/create.js

@@ -26,7 +26,7 @@ export async function createCommand(_project, opts) {
         default: false,
     })).projectType) === true ? 'library' : 'pack';
     const sv = (v) => new SemVer(v);
-    const versions = [[sv('0.13.6'), sv('0.5.4')], [sv('0.14.0-alpha.13'), sv('0.5.4')], [sv('1.0.0-alpha.5'), sv('1.1.6')]];
+    const versions = [[sv('0.13.6'), sv('0.5.4')], [sv('0.14.0-alpha.13'), sv('0.5.4')], [sv('1.0.0-alpha.6'), sv('1.1.9')]];
     const stableIndex = 0;
     const { version } = await inquirer.prompt({
         name: 'version',

package/lib/commands/dependency.d.ts

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

package/lib/commands/dependency.js

@@ -1,10 +1,72 @@
 import fs from 'fs-extra';
 import path from 'path';
+import { exec } from 'child_process';
 import { buildCommand } from './build.js';
 import inquirer from 'inquirer';
 const _fetch = import('node-fetch');
-export async function installNativeCommand() {
-    console.log('unimplemented');
+export async function installNativeCommand(_libraries) {
+    let libraries = _libraries.map((lib) => [lib, false]);
+    let count = libraries.length || 0;
+    const fetch = (await _fetch).default;
+    const manifest = await (await fetch('https://raw.githubusercontent.com/sandstone-mc/sandstone-libraries/main/manifest.json')).json();
+    const search = async () => {
+        const { selected } = await inquirer.prompt({
+            name: 'selected',
+            type: 'checkbox',
+            message: 'Which libraries to add?',
+            choices: manifest.libraries.map((library) => ({
+                name: library.name,
+                value: library.package,
+            })),
+        });
+        if (selected && selected.length !== 0) {
+            libraries.push(...selected.map((lib) => [lib, true]));
+            count += selected.length;
+        }
+    };
+    if (count === 0) {
+        await search();
+    }
+    if (count > 0) {
+        let adding = false;
+        for await (const [library, searched] of libraries) {
+            if (searched) {
+                if (!adding)
+                    adding = [];
+                adding.push(library);
+            }
+            else {
+                let exists = manifest.libraries.find((lib) => lib.name === library);
+                if (exists) {
+                    if (!adding)
+                        adding = [];
+                    adding.push(exists.package);
+                }
+                else {
+                    count--;
+                    console.log(`${library} doesn't exist!`);
+                }
+            }
+        }
+        if (adding) {
+            console.log(`Installing ${adding.join(', ')}...`);
+            const pnpm = await fs.exists(path.resolve('./pnpm-lock.yaml'));
+            const yarn = await fs.exists(path.resolve('./yarn.lock'));
+            const npm = await fs.exists(path.resolve('./package-lock.json'));
+            if (pnpm) {
+                exec(`pnpm i ${adding.join(' ')}`);
+            }
+            else if (yarn) {
+                exec(`yarn add ${adding.join(' ')}`);
+            }
+            else if (npm) {
+                exec(`npm i ${adding.join(' ')}`);
+            }
+            else {
+                console.error('error: no package manager lockfile');
+            }
+        }
+    }
 }
 export async function installVanillaCommand(_libraries) {
     let libraries = _libraries.map((lib) => [lib, false]);
@@ -19,16 +81,14 @@ export async function installVanillaCommand(_libraries) {
     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 scopes = ['data.display.description', 'meta.rawId', 'meta.stats.downloads.total', 'owner.displayName'].map((scope) => `scope=${scope}`).join('&');
+        for await (const { id, displayName, meta, data, owner } of await (await fetch(`${base}/packs?category=Library&sort=downloads&${scopes}${term ? `&search=${encodeURIComponent(term)}` : ''}`)).json()) {
             const option = {
                 id: meta.rawId,
                 name: displayName,
                 owner: owner.displayName,
                 downloads: `${meta.stats.downloads.total}`,
-                description: description,
+                description: data.display.description,
             };
             if (manifest && !manifest[id] && !manifest[meta.rawId]) {
                 if (option.name.length > optionColumn[0])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandstone-cli",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "description": "The CLI for Sandstone - the minecraft pack creation library.",
   "type": "module",
   "exports": "./lib/index.js",
@@ -41,7 +41,7 @@
   },
   "homepage": "https://github.com/sandstone-mc/sandstone-cli#readme",
   "dependencies": {
-    "@types/node": "^20.9.0",
+    "@types/node": "^20.10.0",
     "chalk": "^5.3.0",
     "chalk-template": "^1.1.0",
     "chokidar": "^3.5.3",

package/src/commands/create.ts

@@ -45,7 +45,7 @@ export async function createCommand(_project: string, opts: CreateOptions) {
 
   const sv = (v: string) => new SemVer(v)
 
-  const versions = [[sv('0.13.6'), sv('0.5.4')], [sv('0.14.0-alpha.13'), sv('0.5.4')], [sv('1.0.0-alpha.5'), sv('1.1.6')]] as const
+  const versions = [[sv('0.13.6'), sv('0.5.4')], [sv('0.14.0-alpha.13'), sv('0.5.4')], [sv('1.0.0-alpha.6'), sv('1.1.9')]] as const
 
   const stableIndex = 0
 

package/src/commands/dependency.ts

@@ -1,21 +1,98 @@
 import fs from 'fs-extra'
 import path from 'path'
+import { exec } from 'child_process'
 import { buildCommand } from './build.js'
 import inquirer from 'inquirer'
 
 const _fetch = import('node-fetch')
 
-export async function installNativeCommand() {
-  console.log('unimplemented')
+type LibraryManifest = {
+  libraries: {
+    name: string,
+    package: string,
+  }[]
 }
 
-type SmithedSearch = { id: string, displayName: string }[]
+export async function installNativeCommand(_libraries: string[]) {
+  let libraries: [string, boolean][] = _libraries.map((lib) => [lib, false])
+
+  let count = libraries.length || 0
+
+  const fetch = (await _fetch).default
+
+  const manifest = await (await fetch('https://raw.githubusercontent.com/sandstone-mc/sandstone-libraries/main/manifest.json')).json() as LibraryManifest
+
+  const search = async () => {
+    const { selected } = await inquirer.prompt({
+      name: 'selected',
+      type: 'checkbox',
+      message: 'Which libraries to add?',
+      choices: manifest.libraries.map((library) => ({
+        name: library.name,
+        value: library.package,
+      })),
+    }) as {
+      selected: string[]
+    }
+
+    if (selected && selected.length !== 0) {
+      libraries.push(...selected.map((lib) => [lib, true] as [string, boolean]))
+
+      count += selected.length
+    }
+  }
+
+  if (count === 0) {
+    await search()
+  }
+
+  if (count > 0) {
+    let adding: string[] | false = false
+
+    for await (const [library, searched] of libraries) {
+      if (searched) {
+        if (!adding) adding = []
+        adding.push(library)
+      } else {
+        let exists = manifest.libraries.find((lib) => lib.name === library)
 
-type SmithedMeta = { rawId: string, stats: { downloads: { total: number } }, owner: string }
+        if (exists) {
+          if (!adding) adding = []
+          adding.push(exists.package)
+        } else {
+          count--
 
-type SmithedUser = { displayName: string }
+          console.log(`${library} doesn't exist!`)
+        }
+      }
+    }
+    if (adding) {
+      console.log(`Installing ${adding.join(', ')}...`)
+
+      const pnpm = await fs.exists(path.resolve('./pnpm-lock.yaml'))
+      const yarn = await fs.exists(path.resolve('./yarn.lock'))
+      const npm = await fs.exists(path.resolve('./package-lock.json'))
+
+      if (pnpm) {
+        exec(`pnpm i ${adding.join(' ')}`)
+      } else if (yarn) {
+        exec(`yarn add ${adding.join(' ')}`)
+      } else if (npm) {
+        exec(`npm i ${adding.join(' ')}`)
+      } else {
+        console.error('error: no package manager lockfile')
+      }
+    }
+  }
+}
 
-type SmithedPack = { display: { description: string } }
+type SmithedSearch = { 
+  id: string,
+  displayName: string,
+  data: { display: { description: string } },
+  meta: { rawId: string, stats: { downloads: { total: number } }, owner: string }
+  owner: { displayName: string }
+}[]
 
 export async function installVanillaCommand(_libraries: string[]) {
   let libraries: [string, boolean][] = _libraries.map((lib) => [lib, false])
@@ -35,18 +112,16 @@ export async function installVanillaCommand(_libraries: string[]) {
 
     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 scopes = ['data.display.description', 'meta.rawId', 'meta.stats.downloads.total', 'owner.displayName'].map((scope) => `scope=${scope}`).join('&')
 
-      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
+    for await (const { id, displayName, meta, data, owner } of (await (await fetch(`${base}/packs?category=Library&sort=downloads&${scopes}${term ? `&search=${encodeURIComponent(term)}` : ''}`)).json() as SmithedSearch)) {
 
       const option = {
         id: meta.rawId,
         name: displayName,
         owner: owner.displayName,
         downloads: `${meta.stats.downloads.total}`,
-        description: description,
+        description: data.display.description,
       }
 
       if (manifest && !manifest[id] && !manifest[meta.rawId]) {