tering-serieuze-cli 1.5.2 → 1.7.0

package/.prettierrc

@@ -1,2 +1,6 @@
-tabWidth: 4
-printWidth: 120
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "tabWidth": 4,
+  "printWidth": 120,
+}

package/dist/index.mjs

@@ -30,7 +30,7 @@ async function initCompletion(api2) {
 }
 
 // package.json
-var version = "1.4.0";
+var version = "1.6.0";
 
 // src/index.ts
 var Commands = /* @__PURE__ */ ((Commands2) => {
@@ -130,8 +130,7 @@ program.command("play" /* play */).description("Play a jingle").argument("<folde
 });
 program.command("recent" /* recent */).description("Show recently added jingles, select a jingle to play").action(async () => {
   try {
-    const jingles = await api.jingle.getAll();
-    jingles.sort((a, b) => b.mtime - a.mtime);
+    const jingles = await api.jingle.getRecentlyAdded();
     const answers = await inquirer.prompt([
       {
         type: "list",
@@ -148,32 +147,20 @@ program.command("recent" /* recent */).description("Show recently added jingles,
   }
 });
 program.command("p" /* playShort */).description("Play a jingle by typing (some) parts of the name").argument("<query...>", "The query to search for").action(async (query) => {
-  let jingles;
-  try {
-    jingles = await api.jingle.getAll();
-  } catch (e) {
-    console.error(e.status + ": " + e.message);
-    return;
-  }
-  const matches = jingles.filter((jingle2) => query.every((q) => (jingle2.folder + "/" + jingle2.file).includes(q)));
+  const items = await api.jingle.find(query.join(" "));
   let jingle;
-  if (matches.length === 0) {
+  if (items.length === 0) {
     console.log("No matches found");
     return;
-  } else if (matches.length === 1) {
-    jingle = { folder: matches[0].folder, file: matches[0].file };
+  } else if (items.length === 1) {
+    jingle = items[0];
   } else {
-    const sortedMatches = matches.sort((a, b) => {
-      const aScore = a.keywords.filter((k) => query.includes(k)).length;
-      const bScore = b.keywords.filter((k) => query.includes(k)).length;
-      return bScore - aScore;
-    });
     const answers = await inquirer.prompt([
       {
         type: "list",
         name: "jingle",
         message: playWhichJingleString,
-        choices: sortedMatches.map((jingle2) => jingle2.folder + "/" + jingle2.file)
+        choices: items.map((jingle2) => jingle2.folder + "/" + jingle2.file)
       }
     ]);
     const [folder, file] = answers.jingle.split("/");
@@ -191,7 +178,13 @@ program.command("version" /* version */).description("Show the TSS-CLI version")
 program.command("users").action(async () => {
   try {
     const users = await api.user.getAll();
-    console.log(users);
+    const items = users.map((user) => {
+      return {
+        name: user.email,
+        value: user.id
+      };
+    });
+    console.log(items);
   } catch (e) {
     console.error(e.status + ": " + e.message);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tering-serieuze-cli",
-  "version": "1.5.2",
+  "version": "1.7.0",
   "description": "Teringserieuze CLI",
   "author": "Frank",
   "main": "dist/index.mjs",
@@ -27,8 +27,8 @@
     "figlet": "^1.5.2",
     "inquirer": "^9.1.4",
     "omelette": "^0.4.17",
-    "tering-serieuze-sdk": "^3.1.3",
-    "tering-serieuze-types": "^1.14.1"
+    "tering-serieuze-sdk": "^3.11.0",
+    "tering-serieuze-types": "^1.27.1"
   },
   "devDependencies": {
     "@types/figlet": "^1.5.5",

package/src/completion.ts

@@ -1,18 +1,18 @@
-import omelette from "omelette";
-import { Commands } from "./index";
-import { TssApi } from "tering-serieuze-sdk";
-import { JingleFolder } from "tering-serieuze-types";
+import omelette from 'omelette';
+import { Commands } from './index';
+import { TssApi } from 'tering-serieuze-sdk';
+import { JingleFolder } from 'tering-serieuze-types';
 
 export async function initCompletion(api: TssApi) {
     const playCompletion: { [key: string]: string[] } = {};
-    const jingleFolders = (await api.jingle.getCache().get<JingleFolder[]>("getGrouped")) ?? [];
+    const jingleFolders = (await api.jingle.getCache().get<JingleFolder[]>('getGrouped')) ?? [];
     jingleFolders.forEach((jingleFolder) => {
         playCompletion[jingleFolder.folder] = jingleFolder.jingles.map((jingle) => jingle.file);
     });
 
     const autocompletionTree: { [key in Commands]: any } = {
-        [Commands.autocomplete]: ["--install", "--uninstall"],
-        [Commands.clearcache]: ["auth", "jingle", "all"],
+        [Commands.autocomplete]: ['--install', '--uninstall'],
+        [Commands.clearcache]: ['auth', 'jingle', 'all'],
         [Commands.login]: [],
         [Commands.play]: playCompletion,
         [Commands.recent]: [],
@@ -21,7 +21,7 @@ export async function initCompletion(api: TssApi) {
         [Commands.version]: [],
     };
 
-    const completion = omelette("tss").tree(autocompletionTree);
+    const completion = omelette('tss').tree(autocompletionTree);
     completion.init();
 
     return completion;

package/src/index.ts

@@ -1,71 +1,71 @@
 #! /usr/bin/env node --no-warnings
 
-import { Command } from "commander";
-import figlet from "figlet";
-import inquirer from "inquirer";
-import { TssApi, FilesystemCache } from "tering-serieuze-sdk";
-import { initCompletion } from "./completion";
+import { Command } from 'commander';
+import figlet from 'figlet';
+import inquirer from 'inquirer';
+import { TssApi, FilesystemCache } from 'tering-serieuze-sdk';
+import { initCompletion } from './completion';
 // @ts-ignore
-import { version } from "../package.json";
+import { version } from '../package.json';
 
 export enum Commands {
-    autocomplete = "autocomplete",
-    clearcache = "clearcache",
-    login = "login",
-    play = "play",
-    recent = "recent",
-    jingles = "jingles",
-    playShort = "p",
-    version = "version",
+    autocomplete = 'autocomplete',
+    clearcache = 'clearcache',
+    login = 'login',
+    play = 'play',
+    recent = 'recent',
+    jingles = 'jingles',
+    playShort = 'p',
+    version = 'version',
 }
 
-const playWhichJingleString = "Which jingle do you want to play?";
+const playWhichJingleString = 'Which jingle do you want to play?';
 
 const api = new TssApi(
     {
-        API_URL: process.env.API_URL ?? "https://tss.maxserv.dev:8081",
+        API_URL: process.env.API_URL ?? 'https://tss.maxserv.dev:8081',
     },
     {
-        jingle: new FilesystemCache("jingle"),
-        auth: new FilesystemCache("TSS-TOKEN"),
-    }
+        jingle: new FilesystemCache('jingle'),
+        auth: new FilesystemCache('TSS-TOKEN'),
+    },
 );
 
 const program = new Command();
 const completion = await initCompletion(api);
 
-if (process.argv.length <= 2 || process.argv[2] === "help") {
-    console.log(figlet.textSync("TSS CLI"));
+if (process.argv.length <= 2 || process.argv[2] === 'help') {
+    console.log(figlet.textSync('TSS CLI'));
 }
 
-program.name("tss").description("Dé TSS CLI. Dit ding heeft alles.");
+program.name('tss').description('Dé TSS CLI. Dit ding heeft alles.');
 
 program
     .command(Commands.autocomplete)
-    .description("Install or uninstall TSS CLI autocomplete")
-    .option("-i, --install", "Install TSS CLI autocomplete")
-    .option("-u, --uninstall", "Uninstall TSS CLI autocomplete")
+    .description('Install or uninstall TSS CLI autocomplete')
+    .option('-i, --install', 'Install TSS CLI autocomplete')
+    .option('-u, --uninstall', 'Uninstall TSS CLI autocomplete')
     .action(async (options) => {
         if (options.install) {
-            console.log("TSS CLI autocomplete installed!");
+            console.log('TSS CLI autocomplete installed!');
             completion.setupShellInitFile();
         }
 
         if (options.uninstall) {
-            console.log("TSS autocomplete uninstalled.");
+            console.log('TSS autocomplete uninstalled.');
             completion.cleanupShellInitFile();
         }
     });
 
 program
     .command(Commands.login)
-    .description("Authenticate yourself so you can communicate with the TSS API")
+    .description('Authenticate yourself so you can communicate with the TSS API')
     .action(async () => {
         const { token } = await inquirer.prompt([
             {
-                type: "password",
-                name: "token",
-                message: "What is your token?",
+                type: 'password',
+                name: 'token',
+                message: 'What is your token?',
             },
         ]);
 
@@ -78,12 +78,12 @@ program
 
         try {
             const user = await api.user.get();
-            console.log("Logged in as " + user.email);
+            console.log('Logged in as ' + user.email);
         } catch (e: any) {
             if (e.status >= 500) {
-                console.error("Uit. Dit kan niet gebeuren want TSS geeft een status >= 500 terug");
+                console.error('Uit. Dit kan niet gebeuren want TSS geeft een status >= 500 terug');
             } else {
-                console.error("Invalid token!");
+                console.error('Invalid token!');
             }
 
             await api.auth.removeToken();
@@ -92,43 +92,43 @@ program
 
 program
     .command(Commands.clearcache)
-    .description("Clear the cache")
-    .argument("[type]", "The type of cache to clear (jingle, auth, all)")
+    .description('Clear the cache')
+    .argument('[type]', 'The type of cache to clear (jingle, auth, all)')
     .action(async (type) => {
-        if (type === "jingle") {
+        if (type === 'jingle') {
             await api.jingle.getCache().clear();
-            console.log("Cleared jingle cache");
-        } else if (type === "auth") {
+            console.log('Cleared jingle cache');
+        } else if (type === 'auth') {
             await api.auth.removeToken();
-            console.log("Cleared auth cache");
-        } else if (type === "all" || !type) {
+            console.log('Cleared auth cache');
+        } else if (type === 'all' || !type) {
             await api.auth.removeToken();
             await api.jingle.getCache().clear();
-            console.log("Cleared all caches");
+            console.log('Cleared all caches');
         } else {
-            console.error("Invalid cache type");
+            console.error('Invalid cache type');
         }
     });
 
 program
     .command(Commands.jingles)
-    .description("Show all jingles")
+    .description('Show all jingles')
     .action(async () => {
         try {
             const jingles = await api.jingle.getAll();
             jingles.forEach((jingle) => {
-                console.log(jingle.folder + "/" + jingle.file);
+                console.log(jingle.folder + '/' + jingle.file);
             });
         } catch (e: any) {
-            console.error(e.status + ": " + e.message);
+            console.error(e.status + ': ' + e.message);
         }
     });
 
 program
     .command(Commands.play)
-    .description("Play a jingle")
-    .argument("<folder>", "The folder of the jingle")
-    .argument("<file>", "The jingle to play")
+    .description('Play a jingle')
+    .argument('<folder>', 'The folder of the jingle')
+    .argument('<file>', 'The jingle to play')
     .action(async (folder, file) => {
         try {
             await api.jingle.play({ folder, file });
@@ -139,68 +139,52 @@ program
 
 program
     .command(Commands.recent)
-    .description("Show recently added jingles, select a jingle to play")
+    .description('Show recently added jingles, select a jingle to play')
     .action(async () => {
         try {
-            const jingles = await api.jingle.getAll();
-            jingles.sort((a, b) => b.mtime - a.mtime);
+            const jingles = await api.jingle.getRecentlyAdded();
 
             const answers = await inquirer.prompt([
                 {
-                    type: "list",
-                    name: "jingle",
+                    type: 'list',
+                    name: 'jingle',
                     message: playWhichJingleString,
-                    choices: jingles.slice(0, 30).map((jingle) => jingle.folder + "/" + jingle.file),
+                    choices: jingles.slice(0, 30).map((jingle) => jingle.folder + '/' + jingle.file),
                 },
             ]);
 
-            const [folder, file]: [folder: string, file: string] = answers.jingle.split("/");
+            const [folder, file]: [folder: string, file: string] = answers.jingle.split('/');
             const jingle = { folder, file };
             await api.jingle.play(jingle);
         } catch (e: any) {
-            console.error(e.status + ": " + e.message);
+            console.error(e.status + ': ' + e.message);
         }
     });
 
 program
     .command(Commands.playShort)
-    .description("Play a jingle by typing (some) parts of the name")
-    .argument("<query...>", "The query to search for")
+    .description('Play a jingle by typing (some) parts of the name')
+    .argument('<query...>', 'The query to search for')
     .action(async (query: string[]) => {
-        let jingles;
-        try {
-            jingles = await api.jingle.getAll();
-        } catch (e: any) {
-            console.error(e.status + ": " + e.message);
-            return;
-        }
-
-        const matches = jingles.filter((jingle) => query.every((q) => (jingle.folder + "/" + jingle.file).includes(q)));
+        const items = await api.jingle.find(query.join(' '));
 
         let jingle;
-        if (matches.length === 0) {
-            console.log("No matches found");
+        if (items.length === 0) {
+            console.log('No matches found');
             return;
-        } else if (matches.length === 1) {
-            jingle = { folder: matches[0].folder, file: matches[0].file };
+        } else if (items.length === 1) {
+            jingle = items[0];
         } else {
-            const sortedMatches = matches.sort((a, b) => {
-                const aScore = a.keywords.filter((k) => query.includes(k)).length;
-                const bScore = b.keywords.filter((k) => query.includes(k)).length;
-
-                return bScore - aScore;
-            });
-
             const answers = await inquirer.prompt([
                 {
-                    type: "list",
-                    name: "jingle",
+                    type: 'list',
+                    name: 'jingle',
                     message: playWhichJingleString,
-                    choices: sortedMatches.map((jingle) => jingle.folder + "/" + jingle.file),
+                    choices: items.map((jingle) => jingle.folder + '/' + jingle.file),
                 },
             ]);
 
-            const [folder, file]: [folder: string, file: string] = answers.jingle.split("/");
+            const [folder, file]: [folder: string, file: string] = answers.jingle.split('/');
             jingle = { folder, file };
         }
 
@@ -213,17 +197,23 @@ program
 
 program
     .command(Commands.version)
-    .description("Show the TSS-CLI version")
+    .description('Show the TSS-CLI version')
     .action(() => {
         console.log(version);
     });
 
-program.command("users").action(async () => {
+program.command('users').action(async () => {
     try {
         const users = await api.user.getAll();
-        console.log(users);
+        const items = users.map((user) => {
+            return {
+                name: user.email,
+                value: user.id,
+            };
+        });
+        console.log(items);
     } catch (e: any) {
-        console.error(e.status + ": " + e.message);
+        console.error(e.status + ': ' + e.message);
     }
 });