dicebear 5.0.0-alpha.2 → 5.0.0-alpha.20

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Florian Körner
+Copyright (c) 2022 Florian Körner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/bin/index.js

@@ -1,3 +1,3 @@
-#!/usr/bin/env node
+#!/usr/bin/env node --no-warnings
 
-require('../lib');
+import '../lib/index.js';

package/lib/command/makeStyleCommand.d.ts

@@ -0,0 +1,3 @@
+import type { Style } from '@dicebear/core';
+import { Command } from 'commander';
+export declare function makeStyleCommand(name: string, style: Style<any>): Promise<Command>;

package/lib/command/makeStyleCommand.js

@@ -0,0 +1,84 @@
+import { createAvatar, schema as coreSchema } from '@dicebear/core';
+import { Command } from 'commander';
+import * as path from 'node:path';
+import fs from 'fs-extra';
+import cliProgress from 'cli-progress';
+import { validateInputBySchema } from '../utils/validateInputBySchema.js';
+import { outputStyleLicenseBanner } from '../utils/outputStyleLicenseBanner.js';
+import { getOptionsBySchema } from '../utils/getOptionsBySchema.js';
+import mergeAllOf from 'json-schema-merge-allof';
+import PQueue from 'p-queue';
+import os from 'node:os';
+import { exiftool } from 'exiftool-vendored';
+export async function makeStyleCommand(name, style) {
+    const schema = mergeAllOf({
+        allOf: [
+            {
+                properties: {
+                    count: {
+                        title: 'Count',
+                        description: 'Defines how many avatars to create. Does not work in combination with a "seed".',
+                        type: 'number',
+                        default: 1,
+                    },
+                    format: {
+                        title: 'Format',
+                        type: 'string',
+                        enum: ['svg', 'png', 'jpg', 'jpeg'],
+                        default: 'svg',
+                    },
+                    exif: {
+                        title: 'Include Exif Metadata',
+                        type: 'boolean',
+                        default: false,
+                    },
+                },
+            },
+            coreSchema,
+            style.schema,
+        ],
+        additionalItems: true,
+    }, { ignoreAdditionalProperties: true });
+    const cmd = new Command(name);
+    cmd.arguments('[outputPath]');
+    for (let option of await getOptionsBySchema(schema)) {
+        cmd.addOption(option);
+    }
+    cmd.action(async (outputPath = '.', options = {}) => {
+        const bar = new cliProgress.SingleBar({}, cliProgress.Presets.shades_classic);
+        const validated = validateInputBySchema(options, schema);
+        const count = validated.count;
+        const includeExif = validated.exif;
+        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);
+        });
+        outputPath = path.resolve(process.cwd(), outputPath);
+        await fs.ensureDir(outputPath);
+        for (let i = 0; i < count; i++) {
+            queue.add(async () => {
+                const fileName = path.resolve(process.cwd(), outputPath, `${name}-${i}.${validated.format}`);
+                const avatar = createAvatar(style, validated);
+                switch (validated.format) {
+                    case 'svg':
+                        await avatar.svg().toFile(fileName);
+                        break;
+                    case 'png':
+                        await avatar.png({ includeExif }).toFile(fileName);
+                        break;
+                    case 'jpg':
+                    case 'jpeg':
+                        await avatar.jpeg({ includeExif }).toFile(fileName);
+                        break;
+                }
+                bar.increment();
+            });
+        }
+        await queue.onIdle();
+        bar.stop();
+        exiftool.end();
+    });
+    return cmd;
+}

package/lib/index.js

@@ -1,19 +1,16 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-const update_notifier_1 = __importDefault(require("update-notifier"));
-const getPackageJson_1 = require("./utils/getPackageJson");
-const makeCreateCommand_1 = require("./utils/command/makeCreateCommand");
-const makeProjectCommand_1 = require("./utils/command/makeProjectCommand");
+import { Command } from 'commander';
+import updateNotifier from 'update-notifier';
+import * as collection from '@dicebear/collection';
+import { getPackageJson } from './utils/getPackageJson.js';
+import { makeStyleCommand } from './command/makeStyleCommand.js';
 (async () => {
-    const pkg = await (0, getPackageJson_1.getPackageJson)();
-    const program = new commander_1.Command('dicebear');
-    (0, update_notifier_1.default)({ pkg }).notify();
+    const pkg = await getPackageJson();
+    const program = new Command('dicebear');
+    updateNotifier({ pkg }).notify();
     program.version(pkg.version, '-v, --version');
-    program.addCommand(await (0, makeCreateCommand_1.makeCreateCommand)());
-    program.addCommand(await (0, makeProjectCommand_1.makeProjectCommand)());
+    for (let name of Object.keys(collection)) {
+        const style = collection[name];
+        program.addCommand(await makeStyleCommand(name, style));
+    }
     await program.parseAsync(process.argv);
 })();

package/lib/utils/getOptionsBySchema.d.ts

@@ -1,2 +1,3 @@
+import { Option } from 'commander';
 import { JSONSchema7 } from 'json-schema';
-export declare function getOptionsBySchema(schema: JSONSchema7): Promise<import("commander").Option[]>;
+export declare function getOptionsBySchema(schema: JSONSchema7): Promise<Option[]>;

package/lib/utils/getOptionsBySchema.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOptionsBySchema = void 0;
-const commander_1 = require("commander");
-async function getOptionsBySchema(schema) {
+import { Option } from 'commander';
+export async function getOptionsBySchema(schema) {
     const result = [];
     for (var key in schema.properties) {
         if (false === schema.properties.hasOwnProperty(key)) {
@@ -10,7 +7,7 @@ async function getOptionsBySchema(schema) {
         }
         const property = schema.properties[key];
         if (typeof property === 'object') {
-            const option = new commander_1.Option(`-${key} <value>`);
+            const option = new Option(`--${key} <value>`);
             let description = [property.title, property.description].filter((v) => v).join(' - ');
             let choices = [];
             if (property.enum) {
@@ -31,4 +28,3 @@ async function getOptionsBySchema(schema) {
     }
     return result;
 }
-exports.getOptionsBySchema = getOptionsBySchema;

package/lib/utils/getPackageJson.d.ts

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

package/lib/utils/getPackageJson.js

@@ -1,27 +1,5 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPackageJson = void 0;
-function getPackageJson(packageName) {
-    const packageJson = packageName ? `${packageName}/package.json` : '../../package.json';
-    return Promise.resolve().then(() => __importStar(require(packageJson)));
+import fs from 'fs-extra';
+export function getPackageJson() {
+    const packageJson = new URL('../../package.json', import.meta.url).pathname;
+    return fs.readJson(packageJson);
 }
-exports.getPackageJson = getPackageJson;

package/lib/utils/outputStyleLicenseBanner.js

@@ -1,32 +1,30 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.outputStyleLicenseBanner = void 0;
-const chalk_1 = __importDefault(require("chalk"));
-const terminal_link_1 = __importDefault(require("terminal-link"));
-function outputStyleLicenseBanner(name, style) {
+import chalk from 'chalk';
+import chalkTemplate from 'chalk-template';
+export function outputStyleLicenseBanner(name, style) {
     let banner = ['-'.repeat(64)];
-    let creator = Array.isArray(style.meta.creator) ? style.meta.creator.join(', ') : style.meta.creator;
+    let creator = Array.isArray(style.meta.creator)
+        ? style.meta.creator.join(', ')
+        : style.meta.creator;
     if (style.meta.title && creator) {
-        banner.push((0, chalk_1.default) `{bold ${style.meta.title}} by {bold ${creator}}`);
+        banner.push(chalkTemplate `{bold ${style.meta.title}} by {bold ${creator}}`);
     }
     else if (style.meta.title) {
-        banner.push((0, chalk_1.default) `{bold ${style.meta.title}}`);
+        banner.push(chalkTemplate `{bold ${style.meta.title}}`);
     }
     else if (creator) {
-        banner.push((0, chalk_1.default) `{bold ${name}} by {bold ${creator}}`);
+        banner.push(chalkTemplate `{bold ${name}} by {bold ${creator}}`);
     }
     banner.push('');
+    if (style.meta.homepage) {
+        banner.push(`Homepage: ${style.meta.homepage}`);
+    }
     if (style.meta.source) {
         banner.push(`Source: ${style.meta.source}`);
     }
     if (style.meta.license) {
-        banner.push(`License: ${(0, terminal_link_1.default)(style.meta.license.name, style.meta.license.url)}`);
+        banner.push(`License: ${style.meta.license.name} - ${style.meta.license.url}`);
     }
     banner.push('-'.repeat(64));
     banner.push('');
-    console.log(chalk_1.default.blueBright(banner.join('\n')));
+    console.log(chalk.blueBright(banner.join('\n')));
 }
-exports.outputStyleLicenseBanner = outputStyleLicenseBanner;

package/lib/utils/validateInputBySchema.js

@@ -1,16 +1,10 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateInputBySchema = void 0;
-const ajv_1 = __importDefault(require("ajv"));
-function validateInputBySchema(input, schema) {
-    const validator = new ajv_1.default({
+import Ajv from 'ajv';
+export function validateInputBySchema(input, schema) {
+    const validator = new Ajv({
         strict: false,
         coerceTypes: true,
         useDefaults: false,
-        removeAdditional: false,
+        removeAdditional: true,
     });
     const validate = validator.compile(schema);
     const data = {};
@@ -29,14 +23,11 @@ function validateInputBySchema(input, schema) {
     }
     if (false === validate(data)) {
         if (validate.errors) {
-            for (var errorKey in validate.errors) {
-                if (validate.errors.hasOwnProperty(errorKey)) {
-                    new Error(`${errorKey} - ${validate.errors[errorKey]}`);
-                }
+            for (var error of validate.errors) {
+                throw new Error(`${error.keyword} - ${error.message}`);
             }
         }
         throw new Error('Unknown error');
     }
     return data;
 }
-exports.validateInputBySchema = validateInputBySchema;

package/package.json

@@ -1,60 +1,57 @@
 {
   "name": "dicebear",
-  "version": "5.0.0-alpha.2",
+  "version": "5.0.0-alpha.20",
+  "private": false,
   "description": "CLI for DiceBear - An avatar library for designers and developers",
-  "bin": "bin/index.js",
-  "types": "lib/index.d.ts",
+  "homepage": "https://github.com/dicebear/dicebear",
   "repository": {
     "type": "git",
-    "url": "git@github.com:dicebear/dicebear.git",
-    "directory": "/packages/dicebear"
+    "url": "git+https://github.com/dicebear/dicebear.git"
   },
-  "author": "Florian Körner <contact@florian-koerner.com>",
   "license": "MIT",
-  "private": false,
+  "author": "Florian Körner <contact@florian-koerner.com>",
+  "type": "module",
+  "exports": "./lib/index.js",
+  "types": "./lib/index.d.ts",
+  "bin": "./bin/index.js",
   "files": [
-    "bin",
-    "lib",
     "LICENSE",
+    "lib",
     "README.md"
   ],
   "scripts": {
-    "prepublishOnly": "npm run build",
-    "prebuild": "shx rm -rf lib",
-    "build": "npm run build:ts",
-    "build:ts": "tsc"
+    "prebuild": "del-cli lib",
+    "build": "tsc",
+    "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@dicebear/collection": "^5.0.0-alpha.2",
-    "@dicebear/core": "^5.0.0-alpha.2",
-    "ajv": "^8.1.0",
-    "chalk": "^4.1.1",
-    "cli-progress": "^3.9.0",
-    "commander": "^7.2.0",
-    "dicebear-project": "^5.0.0-alpha.2",
-    "download": "^8.0.0",
-    "execa": "^4.1.0",
-    "fs-extra": "^9.1.0",
+    "@dicebear/collection": "^5.0.0-alpha.20",
+    "@dicebear/core": "^5.0.0-alpha.20",
+    "@resvg/resvg-js": "^1.4.0",
+    "ajv": "^8.11.0",
+    "chalk": "^5.0.1",
+    "chalk-template": "^0.4.0",
+    "cli-progress": "^3.10.0",
+    "commander": "^9.2.0",
+    "exiftool-vendored": "^16.3.0",
+    "fs-extra": "^10.1.0",
     "json-schema-merge-allof": "^0.8.1",
-    "ora": "^5.4.0",
-    "replace-in-file": "^6.2.0",
-    "sharp": "^0.28.1",
-    "terminal-link": "^2.1.1",
+    "p-queue": "^7.2.0",
+    "sharp": "^0.30.4",
     "update-notifier": "^5.1.0"
   },
   "devDependencies": {
-    "@tsconfig/node14": "^1.0.1",
-    "@types/cli-progress": "^3.9.1",
-    "@types/download": "^6.2.4",
-    "@types/fs-extra": "^9.0.11",
-    "@types/json-schema": "^7.0.7",
-    "@types/json-schema-merge-allof": "^0.6.0",
-    "@types/semver": "^7.3.6",
-    "@types/sharp": "^0.28.0",
-    "@types/update-notifier": "^5.0.0",
-    "shx": "^0.3.3",
-    "typescript": "^4.3.5"
+    "@tsconfig/recommended": "^1.0.1",
+    "@types/cli-progress": "^3.9.2",
+    "@types/fs-extra": "^9.0.13",
+    "@types/json-schema": "^7.0.11",
+    "@types/json-schema-merge-allof": "^0.6.1",
+    "@types/update-notifier": "^5.1.0",
+    "del-cli": "^4.0.1",
+    "typescript": "^4.6.3"
   },
-  "homepage": "https://github.com/dicebear/dicebear",
-  "gitHead": "a29200fdf7cc9a6ddbb363c9b7f275844b005361"
+  "engines": {
+    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+  },
+  "gitHead": "6b1c2bd64294365be21d0a133a362ede5ed62b5a"
 }

package/lib/utils/command/makeCreateCommand.d.ts

@@ -1 +0,0 @@
-export declare function makeCreateCommand(): Promise<import("commander").Command>;

package/lib/utils/command/makeCreateCommand.js

@@ -1,41 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeCreateCommand = void 0;
-const commander_1 = require("commander");
-const makeCreateStyleCommand_1 = require("./makeCreateStyleCommand");
-const collection = __importStar(require("@dicebear/collection"));
-async function makeCreateCommand() {
-    const cmd = new commander_1.Command('create');
-    try {
-        for (let name of Object.keys(collection)) {
-            const style = collection[name];
-            cmd.addCommand(await (0, makeCreateStyleCommand_1.makeCreateStyleCommand)(name, style));
-        }
-    }
-    catch {
-        cmd.action(() => {
-            throw new Error('Could not load `@dicebear/collection`.');
-        });
-    }
-    return cmd;
-}
-exports.makeCreateCommand = makeCreateCommand;

package/lib/utils/command/makeCreateStyleCommand.d.ts

@@ -1,2 +0,0 @@
-import type { Style } from '@dicebear/core';
-export declare function makeCreateStyleCommand(name: string, style: Style<any>): Promise<import("commander").Command>;

package/lib/utils/command/makeCreateStyleCommand.js

@@ -1,102 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeCreateStyleCommand = void 0;
-const core_1 = require("@dicebear/core");
-const commander_1 = require("commander");
-const path = __importStar(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const sharp_1 = __importDefault(require("sharp"));
-const cli_progress_1 = __importDefault(require("cli-progress"));
-const validateInputBySchema_1 = require("../validateInputBySchema");
-const outputStyleLicenseBanner_1 = require("../outputStyleLicenseBanner");
-const getOptionsBySchema_1 = require("../getOptionsBySchema");
-const json_schema_merge_allof_1 = __importDefault(require("json-schema-merge-allof"));
-async function makeCreateStyleCommand(name, style) {
-    const schema = (0, json_schema_merge_allof_1.default)({
-        allOf: [
-            {
-                properties: {
-                    count: {
-                        title: 'Count',
-                        description: 'Defines how many avatars to create. Does not work in combination with a "seed".',
-                        type: 'number',
-                        default: 1,
-                    },
-                    format: {
-                        title: 'Format',
-                        type: 'string',
-                        enum: ['svg', 'png', 'jpg', 'jpeg'],
-                        default: 'svg',
-                    },
-                },
-            },
-            core_1.schema,
-            style.schema,
-        ],
-        additionalItems: true,
-    }, { ignoreAdditionalProperties: true });
-    const cmd = new commander_1.Command(name);
-    cmd.arguments('[outputPath]');
-    for (let option of await (0, getOptionsBySchema_1.getOptionsBySchema)(schema)) {
-        cmd.addOption(option);
-    }
-    cmd.action(async (outputPath = '.', options = {}) => {
-        const bar = new cli_progress_1.default.SingleBar({}, cli_progress_1.default.Presets.shades_classic);
-        const validated = (0, validateInputBySchema_1.validateInputBySchema)(options, schema);
-        const promises = [];
-        (0, outputStyleLicenseBanner_1.outputStyleLicenseBanner)(name, style);
-        bar.start(validated.count, 0);
-        outputPath = path.resolve(process.cwd(), outputPath);
-        await fs_extra_1.default.ensureDir(outputPath);
-        for (let i = 0; i < validated.count; i++) {
-            promises.push((async () => {
-                if (validated.format !== 'svg') {
-                    validated.base64 = false;
-                    validated.dataUri = false;
-                    validated.width = validated.width || validated.height || 512;
-                    validated.height = validated.width;
-                }
-                const fileName = path.resolve(process.cwd(), outputPath, `${name}-${i}.${validated.format}`);
-                let avatar = (0, core_1.createAvatar)(style, validated);
-                switch (validated.format) {
-                    case 'png':
-                        await (0, sharp_1.default)(Buffer.from(avatar)).png().toFile(fileName);
-                        break;
-                    case 'jpg':
-                    case 'jpeg':
-                        await (0, sharp_1.default)(Buffer.from(avatar)).jpeg().toFile(fileName);
-                        break;
-                    default:
-                        await fs_extra_1.default.writeFile(fileName, avatar, { encoding: 'utf-8' });
-                }
-                bar.increment();
-            })());
-        }
-        await Promise.all(promises);
-        bar.stop();
-    });
-    return cmd;
-}
-exports.makeCreateStyleCommand = makeCreateStyleCommand;

package/lib/utils/command/makeProjectCommand.d.ts

@@ -1 +0,0 @@
-export declare function makeProjectCommand(): Promise<import("commander").Command>;

package/lib/utils/command/makeProjectCommand.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeProjectCommand = void 0;
-const commander_1 = require("commander");
-const makeNewCommand_1 = require("dicebear-project/lib/utils/command/makeNewCommand");
-const makeBuildCommand_1 = require("dicebear-project/lib/utils/command/makeBuildCommand");
-async function makeProjectCommand() {
-    const cmd = new commander_1.Command('project');
-    cmd.addCommand(await (0, makeNewCommand_1.makeNewCommand)());
-    cmd.addCommand(await (0, makeBuildCommand_1.makeBuildCommand)());
-    return cmd;
-}
-exports.makeProjectCommand = makeProjectCommand;