sandstone-cli 1.1.8 → 1.1.9

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.js

@@ -19,16 +19,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.9",
   "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

@@ -9,13 +9,13 @@ 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 } }
+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 +35,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]) {