dicebear 8.0.0-rc.2 → 8.0.1

package/README.md

@@ -1,10 +1,13 @@
-<h1 align="center"><img src="https://dicebear.com/api/male/seed.svg?mood=happy" width="124" /> <br />DiceBear CLI</h1>
-<p align="center">
-  <strong>CLI for DiceBear - An avatar library for designers and developers.</strong>
-</p>
+<h1><img src="https://www.dicebear.com/logo-readme.svg" width="28" /> DiceBear CLI</h1>
 
-<p align="center">
-  <a href="https://dicebear.com/integrations/cli">
-    Read Documentation
-  </a>
+<p>
+  <img src="https://api.dicebear.com/8.x/adventurer/svg?seed=Mimi&backgroundColor=0077b6&radius=10" width="64" />
+  <img src="https://api.dicebear.com/8.x/open-peeps/svg?seed=Kitty&backgroundColor=0096c7&radius=10" width="64" />
+  <img src="https://api.dicebear.com/8.x/pixel-art/svg?seed=Lilly&backgroundColor=00b4d8&radius=10" width="64" />
+  <img src="https://api.dicebear.com/8.x/lorelei/svg?seed=Tigger&backgroundColor=48cae4&radius=10" width="64" />
+  <img src="https://api.dicebear.com/8.x/bottts/svg?seed=Zoe&backgroundColor=90e0ef&radius=10" width="64" />
+  <img src="https://api.dicebear.com/8.x/initials/svg?seed=..&backgroundColor=ade8f4&radius=10" width="64" />
 </p>
+
+[Playground](https://www.dicebear.com/playground) |
+[Documentation](https://www.dicebear.com/how-to-use/cli/)

package/lib/index.js

@@ -1,16 +1,16 @@
 import updateNotifier from 'update-notifier';
+import * as collection from '@dicebear/collection';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import { readJson } from 'fs-extra';
-import { createCommand } from './commands/create/index.js';
+import { getPackageJson } from './utils/getPackageJson.js';
+import { addStyleCommand } from './utils/addStyleCommand.js';
 (async () => {
-    const pkg = await readJson(new URL('../../package.json', import.meta.url).pathname);
+    const pkg = await getPackageJson();
     updateNotifier({ pkg }).notify();
-    yargs(hideBin(process.argv))
-        .command(createCommand)
-        .strictCommands()
-        .demandCommand()
-        .help()
-        .locale('en')
-        .parse();
+    const cli = yargs(hideBin(process.argv));
+    for (let name of Object.keys(collection)) {
+        const style = collection[name];
+        addStyleCommand(cli, name, style);
+    }
+    cli.demandCommand().help().locale('en').parse();
 })();

package/lib/utils/addStyleCommand.d.ts

@@ -0,0 +1,3 @@
+import { Style } from '@dicebear/core';
+import yargs from 'yargs';
+export declare function addStyleCommand(cli: yargs.Argv<{}>, name: string, style: Style<any>): yargs.Argv<{}>;

package/lib/utils/addStyleCommand.js

@@ -0,0 +1,74 @@
+import { createAvatar } from '@dicebear/core';
+import cliProgress from 'cli-progress';
+import PQueue from 'p-queue';
+import os from 'node:os';
+import * as path from 'node:path';
+import fs from 'fs-extra';
+import { exiftool } from 'exiftool-vendored';
+import { getStyleCommandSchema } from './getStyleCommandSchema.js';
+import { getOptionsBySchema } from './getOptionsBySchema.js';
+import { validateInputBySchema } from './validateInputBySchema.js';
+import { outputStyleLicenseBanner } from './outputStyleLicenseBanner.js';
+import { createRandomSeed } from './createRandomSeed.js';
+export function addStyleCommand(cli, name, style) {
+    const schema = getStyleCommandSchema(style);
+    return cli.command({
+        command: `${name} [outputPath]`,
+        describe: `Generate "${name}" avatar(s)`,
+        builder: (yargs) => {
+            return yargs
+                .default('outputPath', '.')
+                .options(getOptionsBySchema(schema));
+        },
+        handler: async (argv) => {
+            const bar = new cliProgress.SingleBar({}, cliProgress.Presets.shades_classic);
+            const validated = validateInputBySchema(argv, schema);
+            const format = validated.format;
+            const count = validated.count;
+            const includeExif = validated.exif;
+            const json = validated.json;
+            outputStyleLicenseBanner(name, style);
+            bar.start(count, 0);
+            const queue = new PQueue({ concurrency: os.cpus().length });
+            queue.on('next', () => {
+                bar.update(count - queue.size - queue.pending);
+            });
+            const outputPath = path.resolve(process.cwd(), argv.outputPath);
+            await fs.ensureDir(outputPath);
+            for (let i = 0; i < count; i++) {
+                queue.add(async () => {
+                    const fileName = path.resolve(process.cwd(), outputPath, `${name}-${i}.${format}`);
+                    const avatar = createAvatar(style, count <= 1
+                        ? validated
+                        : {
+                            ...validated,
+                            seed: createRandomSeed(),
+                        });
+                    switch (format) {
+                        case 'svg':
+                            await avatar.toFile(fileName);
+                            break;
+                        case 'png':
+                            await avatar.png({ includeExif }).toFile(fileName);
+                            break;
+                        case 'jpg':
+                        case 'jpeg':
+                            await avatar.jpeg({ includeExif }).toFile(fileName);
+                            break;
+                        case 'json':
+                            await fs.writeJSON(fileName, avatar.toJson(), { spaces: 2 });
+                            break;
+                    }
+                    if (json && 'json' !== format) {
+                        const jsonFileName = path.resolve(process.cwd(), outputPath, `${name}-${i}.json`);
+                        await fs.writeJSON(jsonFileName, avatar.toJson(), { spaces: 2 });
+                    }
+                    bar.increment();
+                });
+            }
+            await queue.onIdle();
+            bar.stop();
+            exiftool.end();
+        },
+    });
+}

package/lib/utils/getPackageJson.d.ts

@@ -0,0 +1,2 @@
+import type { Package } from 'update-notifier';
+export declare function getPackageJson(): Promise<Package>;

package/lib/utils/getPackageJson.js

@@ -0,0 +1,5 @@
+import fs from 'fs-extra';
+export function getPackageJson() {
+    const packageJson = new URL('../../package.json', import.meta.url).pathname;
+    return fs.readJson(packageJson);
+}

package/lib/{commands/create/utils/getSchema.d.ts → utils/getStyleCommandSchema.d.ts}

@@ -1,3 +1,3 @@
 import type { Style } from '@dicebear/core';
 import type { JSONSchema7 } from 'json-schema';
-export declare function getSchema(style: Style<any>): JSONSchema7;
+export declare function getStyleCommandSchema(style: Style<any>): JSONSchema7;

package/lib/{commands/create/utils/getSchema.js → utils/getStyleCommandSchema.js}

@@ -1,6 +1,6 @@
 import { schema as coreSchema } from '@dicebear/core';
 import mergeAllOf from 'json-schema-merge-allof';
-export function getSchema(style) {
+export function getStyleCommandSchema(style) {
     var _a;
     return mergeAllOf({
         allOf: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dicebear",
-  "version": "8.0.0-rc.2",
+  "version": "8.0.1",
   "private": false,
   "description": "CLI for DiceBear - An avatar library for designers and developers",
   "homepage": "https://github.com/dicebear/dicebear",
@@ -25,18 +25,18 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@dicebear/collection": "8.0.0-rc.2",
-    "@dicebear/core": "8.0.0-rc.2",
+    "@dicebear/collection": "8.0.1",
+    "@dicebear/core": "8.0.1",
     "@resvg/resvg-js": "^2.4.1",
     "ajv": "^8.12.0",
     "chalk": "^5.2.0",
     "chalk-template": "^1.0.0",
     "cli-progress": "^3.12.0",
-    "exiftool-vendored": "^22.0.0",
+    "exiftool-vendored": "^23.0.0",
     "fs-extra": "^11.1.1",
     "json-schema-merge-allof": "^0.8.1",
     "p-queue": "^7.3.4",
-    "sharp": "^0.32.1",
+    "sharp": "^0.32.6",
     "update-notifier": "^6.0.2",
     "yargs": "^17.7.1"
   },
@@ -53,5 +53,5 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "gitHead": "226c203a893f9e22401d35ab24c0418462d262c9"
+  "gitHead": "dc11ff0fa0328c521e5769fde4414ad5a6dc7d2d"
 }

package/lib/commands/create/index.d.ts

@@ -1,2 +0,0 @@
-import type { CommandModule } from 'yargs';
-export declare const createCommand: CommandModule;

package/lib/commands/create/index.js

@@ -1,85 +0,0 @@
-import { createAvatar } from '@dicebear/core';
-import cliProgress from 'cli-progress';
-import PQueue from 'p-queue';
-import os from 'node:os';
-import * as path from 'node:path';
-import fs from 'fs-extra';
-import { exiftool } from 'exiftool-vendored';
-import * as collection from '@dicebear/collection';
-import { getSchema } from './utils/getSchema.js';
-import { getOptionsBySchema } from './utils/getOptionsBySchema.js';
-import { validateInputBySchema } from './utils/validateInputBySchema.js';
-import { outputStyleLicenseBanner } from './utils/outputStyleLicenseBanner.js';
-import { createRandomSeed } from './utils/createRandomSeed.js';
-export const createCommand = {
-    command: `create`,
-    describe: `Generate avatars`,
-    builder: async (yargs) => {
-        for (let name of Object.keys(collection)) {
-            const style = collection[name];
-            const schema = getSchema(style);
-            yargs.command({
-                command: `${name} [outputPath]`,
-                describe: `Generate "${name}" avatars`,
-                builder: (yargs) => {
-                    return yargs
-                        .default('outputPath', '.')
-                        .options(getOptionsBySchema(getSchema(style)));
-                },
-                handler: async (argv) => {
-                    const bar = new cliProgress.SingleBar({}, cliProgress.Presets.shades_classic);
-                    const validated = validateInputBySchema(argv, schema);
-                    const format = validated.format;
-                    const count = validated.count;
-                    const includeExif = validated.exif;
-                    const json = validated.json;
-                    outputStyleLicenseBanner(name, style);
-                    bar.start(count, 0);
-                    const queue = new PQueue({ concurrency: os.cpus().length });
-                    queue.on('next', () => {
-                        bar.update(count - queue.size - queue.pending);
-                    });
-                    const outputPath = path.resolve(process.cwd(), argv.outputPath);
-                    await fs.ensureDir(outputPath);
-                    for (let i = 0; i < count; i++) {
-                        queue.add(async () => {
-                            const fileName = path.resolve(process.cwd(), outputPath, `${name}-${i}.${format}`);
-                            const avatar = createAvatar(style, count <= 1
-                                ? validated
-                                : {
-                                    ...validated,
-                                    seed: createRandomSeed(),
-                                });
-                            switch (format) {
-                                case 'svg':
-                                    await avatar.toFile(fileName);
-                                    break;
-                                case 'png':
-                                    await avatar.png({ includeExif }).toFile(fileName);
-                                    break;
-                                case 'jpg':
-                                case 'jpeg':
-                                    await avatar.jpeg({ includeExif }).toFile(fileName);
-                                    break;
-                                case 'json':
-                                    await fs.writeJSON(fileName, avatar.toJson(), { spaces: 2 });
-                                    break;
-                            }
-                            if (json && 'json' !== format) {
-                                const jsonFileName = path.resolve(process.cwd(), outputPath, `${name}-${i}.json`);
-                                await fs.writeJSON(jsonFileName, avatar.toJson(), { spaces: 2 });
-                            }
-                            bar.increment();
-                        });
-                    }
-                    await queue.onIdle();
-                    bar.stop();
-                    exiftool.end();
-                },
-            });
-        }
-        return yargs;
-    },
-    handler: async (argv) => {
-    }
-};