Merge pull request #9 from ianfabs/fix-cli

Resolve issues by cleaning up cli code

Author: ianfabs

cli.ts

@@ -4,24 +4,18 @@
 */
 import nanoid from "./mod.ts";
 import customAlphabet from "./customAlphabet.ts"
-import url from "./url.ts";
 import { parse } from "https://deno.land/std/flags/mod.ts";
 // import { red, bold } from "https://deno.land/std/fmt/colors.ts";
 
 // Grab CLI arguments
 const flags = parse(Deno.args);
-
-// Logging functions
-const log = async (message: string, type: Deno.File = Deno.stdin) => {
-  const encoder = new TextEncoder();
-  const buf = new Deno.Buffer(encoder.encode(message+"\n"));
-  Deno.copy(Deno.stdout, buf);
-};
 // const error = (message: string) => log(bold("Error: ") + message, Deno.stderr);
-
+console.log(`nanoid v3.0.0\n------------------`);
 // Display help message, if requested
 if (flags.h || flags.help) {
-  log(`
+  console.log(`original by Andrey Sitnik
+port for deno by Ian Fabs
+
   Usage
     $ nanoid
   Options
@@ -40,12 +34,16 @@ if (flags.h || flags.help) {
   `);
 } else {
   // Check if the alphabet supplied is the same as the default one
-  const equivalent = (a: string, b: string): boolean => JSON.stringify(a.split('').sort()) === JSON.stringify(b.split('').sort());
   const size = flags.s ?? flags.size;
   const alphabet = flags.a ?? flags.alphabet;
-  const id = alphabet && !equivalent(alphabet, url) ? customAlphabet(alphabet, size ?? 12) : nanoid(size);
 
-  log(id);
+  let id;
+  if (alphabet)
+    id = customAlphabet(alphabet, size)();
+  else
+    id = nanoid(size);
+
+  console.log(`\n${id}\n`);
 }
 
 Deno.stdin.close();