dicebear 4.10.2 → 5.0.0-alpha.11

package/README.md

@@ -4,7 +4,7 @@
 </p>
 
 <p align="center">
-  <a href="https://avatars.dicebear.com/integrations/cli">
+  <a href="https://dicebear.com/integrations/cli">
     Read Documentation
   </a>
 </p>

package/bin/index.js

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

package/lib/index.js

@@ -1,19 +1,12 @@
-"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 { getPackageJson } from './utils/getPackageJson.js';
+import { makeCreateCommand } from './utils/command/makeCreateCommand.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)());
+    program.addCommand(await makeCreateCommand());
     await program.parseAsync(process.argv);
 })();

package/lib/utils/command/makeCreateCommand.js

@@ -1,41 +1,15 @@
-"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`.');
+import { Command } from 'commander';
+import { makeCreateStyleCommand } from './makeCreateStyleCommand.js';
+import * as collection from '@dicebear/collection';
+export async function makeCreateCommand() {
+    const cmd = new Command('create');
+    for (let name of Object.keys(collection)) {
+        const style = collection[name];
+        console.log({
+            name,
+            style,
         });
+        cmd.addCommand(await makeCreateStyleCommand(name, style));
     }
     return cmd;
 }
-exports.makeCreateCommand = makeCreateCommand;

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

@@ -1,2 +1,2 @@
-import type { Style } from '@dicebear/avatars';
+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,40 +1,16 @@
-"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 avatars_1 = require("@dicebear/avatars");
-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)({
+import { createAvatar, schema as coreSchema } from '@dicebear/core';
+import { Command } from 'commander';
+import * as path from 'path';
+import fs from 'fs-extra';
+import sharp from 'sharp';
+import { renderAsync } from '@resvg/resvg-js';
+import cliProgress from 'cli-progress';
+import { validateInputBySchema } from '../validateInputBySchema.js';
+import { outputStyleLicenseBanner } from '../outputStyleLicenseBanner.js';
+import { getOptionsBySchema } from '../getOptionsBySchema.js';
+import mergeAllOf from 'json-schema-merge-allof';
+export async function makeCreateStyleCommand(name, style) {
+    const schema = mergeAllOf({
         allOf: [
             {
                 properties: {
@@ -52,24 +28,24 @@ async function makeCreateStyleCommand(name, style) {
                     },
                 },
             },
-            avatars_1.schema,
+            coreSchema,
             style.schema,
         ],
         additionalItems: true,
     }, { ignoreAdditionalProperties: true });
-    const cmd = new commander_1.Command(name);
+    const cmd = new Command(name);
     cmd.arguments('[outputPath]');
-    for (let option of await (0, getOptionsBySchema_1.getOptionsBySchema)(schema)) {
+    for (let option of await 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 bar = new cliProgress.SingleBar({}, cliProgress.Presets.shades_classic);
+        const validated = validateInputBySchema(options, schema);
         const promises = [];
-        (0, outputStyleLicenseBanner_1.outputStyleLicenseBanner)(name, style);
+        outputStyleLicenseBanner(name, style);
         bar.start(validated.count, 0);
         outputPath = path.resolve(process.cwd(), outputPath);
-        await fs_extra_1.default.ensureDir(outputPath);
+        await fs.ensureDir(outputPath);
         for (let i = 0; i < validated.count; i++) {
             promises.push((async () => {
                 if (validated.format !== 'svg') {
@@ -79,17 +55,27 @@ async function makeCreateStyleCommand(name, style) {
                     validated.height = validated.width;
                 }
                 const fileName = path.resolve(process.cwd(), outputPath, `${name}-${i}.${validated.format}`);
-                let avatar = (0, avatars_1.createAvatar)(style, validated);
+                const avatar = createAvatar(style, validated);
+                const png = await renderAsync(avatar, {
+                    font: {
+                        loadSystemFonts: false,
+                        defaultFontFamily: 'Inter',
+                        fontFiles: [
+                            new URL('../../../fonts/inter/inter-regular.otf', import.meta.url).pathname,
+                            new URL('../../../fonts/inter/inter-bold.otf', import.meta.url).pathname,
+                        ],
+                    },
+                });
                 switch (validated.format) {
                     case 'png':
-                        await (0, sharp_1.default)(Buffer.from(avatar)).png().toFile(fileName);
+                        await fs.writeFile(fileName, png);
                         break;
                     case 'jpg':
                     case 'jpeg':
-                        await (0, sharp_1.default)(Buffer.from(avatar)).jpeg().toFile(fileName);
+                        await sharp(png).jpeg().toFile(fileName);
                         break;
                     default:
-                        await fs_extra_1.default.writeFile(fileName, avatar, { encoding: 'utf-8' });
+                        await fs.writeFile(fileName, avatar, { encoding: 'utf-8' });
                 }
                 bar.increment();
             })());
@@ -99,4 +85,3 @@ async function makeCreateStyleCommand(name, style) {
     });
     return cmd;
 }
-exports.makeCreateStyleCommand = makeCreateStyleCommand;

package/lib/utils/getOptionsBySchema.js

@@ -1,21 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOptionsBySchema = void 0;
-const commander_1 = require("commander");
-const avatars_1 = require("@dicebear/avatars");
-async function getOptionsBySchema(schema) {
+import { Option } from 'commander';
+export async function getOptionsBySchema(schema) {
     const result = [];
-    const aliases = avatars_1.utils.schema.aliases(schema);
     for (var key in schema.properties) {
         if (false === schema.properties.hasOwnProperty(key)) {
             continue;
         }
         const property = schema.properties[key];
-        const names = aliases.find((v) => v.includes(key)) ?? [key];
-        const isPrimary = names[0] === key;
-        if (isPrimary && typeof property === 'object') {
-            const options = names.map((name) => (name.length === 1 ? `-${name}` : `--${name}`));
-            const option = new commander_1.Option(`${options.join(', ')} <value>`);
+        if (typeof property === 'object') {
+            const option = new Option(`-${key} <value>`);
             let description = [property.title, property.description].filter((v) => v).join(' - ');
             let choices = [];
             if (property.enum) {
@@ -36,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.d.ts

@@ -1,2 +1,2 @@
-import type { Style } from '@dicebear/avatars';
+import type { Style } from '@dicebear/core';
 export declare function outputStyleLicenseBanner(name: string, style: Style<any>): void;

package/lib/utils/outputStyleLicenseBanner.js

@@ -1,32 +1,25 @@
-"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 link from 'terminal-link';
+export function outputStyleLicenseBanner(name, style) {
     let banner = ['-'.repeat(64)];
     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(chalk `{bold ${style.meta.title}} by {bold ${creator}}`);
     }
     else if (style.meta.title) {
-        banner.push((0, chalk_1.default) `{bold ${style.meta.title}}`);
+        banner.push(chalk `{bold ${style.meta.title}}`);
     }
     else if (creator) {
-        banner.push((0, chalk_1.default) `{bold ${name}} by {bold ${creator}}`);
+        banner.push(chalk `{bold ${name}} by {bold ${creator}}`);
     }
     banner.push('');
     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: ${link(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,12 +1,6 @@
-"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,
@@ -39,4 +33,3 @@ function validateInputBySchema(input, schema) {
     }
     return data;
 }
-exports.validateInputBySchema = validateInputBySchema;

package/package.json

@@ -1,61 +1,62 @@
 {
   "name": "dicebear",
-  "version": "4.10.2",
+  "version": "5.0.0-alpha.11",
+  "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": {
-    "@apidevtools/json-schema-ref-parser": "^9.0.7",
-    "@dicebear/avatars": "^4.10.2",
-    "@dicebear/collection": "^4.10.2",
+    "@dicebear/collection": "^5.0.0-alpha.11",
+    "@dicebear/core": "^5.0.0-alpha.11",
+    "@resvg/resvg-js": "^1.2.0",
     "ajv": "^8.1.0",
     "chalk": "^4.1.1",
     "cli-progress": "^3.9.0",
     "commander": "^7.2.0",
-    "dicebear-project": "^4.10.2",
     "download": "^8.0.0",
     "execa": "^4.1.0",
-    "fs-extra": "^9.1.0",
+    "fs-extra": "^10.0.0",
     "json-schema-merge-allof": "^0.8.1",
     "ora": "^5.4.0",
     "replace-in-file": "^6.2.0",
-    "sharp": "^0.28.1",
+    "sharp": "^0.29.3",
     "terminal-link": "^2.1.1",
     "update-notifier": "^5.1.0"
   },
   "devDependencies": {
-    "@tsconfig/node14": "^1.0.1",
+    "@tsconfig/recommended": "^1.0.0",
     "@types/cli-progress": "^3.9.1",
     "@types/download": "^6.2.4",
-    "@types/fs-extra": "^9.0.11",
+    "@types/fs-extra": "^9.0.13",
     "@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/sharp": "^0.29.5",
     "@types/update-notifier": "^5.0.0",
-    "shx": "^0.3.3",
-    "typescript": "^4.3.5"
+    "del-cli": "^4.0.1",
+    "typescript": "^4.5.4"
   },
-  "homepage": "https://github.com/dicebear/dicebear",
-  "gitHead": "28ffc2046de961f814b3c5804c562dd318821a7b"
+  "engines": {
+    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+  },
+  "gitHead": "93e6f1be9fff392ded1f18c8320b6a0ca8e695c1"
 }

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;