dicebear 5.0.0-alpha.33 → 5.0.0-alpha.35

package/lib/utils/getOptionsBySchema.d.ts

@@ -1,2 +1,2 @@
-import { JSONSchema7 } from 'json-schema';
-export declare function getOptionsBySchema(schema: JSONSchema7): Record<string, any>;
+import { StyleSchema } from '@dicebear/core';
+export declare function getOptionsBySchema(schema: StyleSchema): Record<string, any>;

package/lib/utils/getOptionsBySchema.js

@@ -5,36 +5,34 @@ export function getOptionsBySchema(schema) {
             continue;
         }
         const property = schema.properties[key];
-        if (typeof property === 'object') {
-            const option = {
-                type: property.type,
-            };
-            if (option.type === 'integer') {
-                option.type = 'number';
-            }
-            option.choices = [];
-            if (property.enum) {
-                option.choices.push(...property.enum.filter((v) => typeof v === 'string'));
-            }
-            if (typeof property.items === 'object' &&
-                'enum' in property.items &&
-                property.items.enum) {
-                option.choices.push(...property.items.enum.filter((v) => typeof v === 'string'));
-            }
-            if (option.choices.length === 0) {
-                delete option.choices;
-            }
-            if (property.default !== undefined && property.default !== null) {
-                option.default =
-                    typeof property.default === 'boolean'
-                        ? property.default
-                        : property.default;
-            }
-            if (property.description) {
-                option.description = property.description;
-            }
-            result[key] = option;
+        const option = {
+            type: property.type,
+        };
+        if (option.type === 'integer') {
+            option.type = 'number';
         }
+        option.choices = [];
+        if (property.enum) {
+            option.choices.push(...property.enum.filter((v) => typeof v === 'string'));
+        }
+        if (typeof property.items === 'object' &&
+            'enum' in property.items &&
+            property.items.enum) {
+            option.choices.push(...property.items.enum.filter((v) => typeof v === 'string'));
+        }
+        if (option.choices.length === 0) {
+            delete option.choices;
+        }
+        if (property.default !== undefined && property.default !== null) {
+            option.default =
+                typeof property.default === 'boolean'
+                    ? property.default
+                    : property.default;
+        }
+        if (property.description) {
+            option.description = property.description;
+        }
+        result[key] = option;
     }
     return result;
 }

package/lib/utils/getStyleCommandSchema.d.ts

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

package/lib/utils/getStyleCommandSchema.js

@@ -1,30 +1,25 @@
 import { schema as coreSchema } from '@dicebear/core';
-import mergeAllOf from 'json-schema-merge-allof';
 export function getStyleCommandSchema(style) {
-    return mergeAllOf({
-        allOf: [
-            {
-                properties: {
-                    count: {
-                        description: 'Defines how many avatars to create.',
-                        type: 'number',
-                        default: 1,
-                    },
-                    format: {
-                        type: 'string',
-                        enum: ['svg', 'png', 'jpg', 'jpeg'],
-                        default: 'svg',
-                    },
-                    exif: {
-                        description: 'Include Exif Metadata',
-                        type: 'boolean',
-                        default: false,
-                    },
-                },
+    return {
+        $schema: 'http://json-schema.org/draft-07/schema#',
+        properties: {
+            count: {
+                description: 'Defines how many avatars to create.',
+                type: 'number',
+                default: 1,
             },
-            coreSchema,
-            style.schema,
-        ],
-        additionalItems: true,
-    }, { ignoreAdditionalProperties: true });
+            format: {
+                type: 'string',
+                enum: ['svg', 'png', 'jpg', 'jpeg'],
+                default: 'svg',
+            },
+            exif: {
+                description: 'Include Exif Metadata',
+                type: 'boolean',
+                default: false,
+            },
+            ...coreSchema.properties,
+            ...style.schema.properties,
+        },
+    };
 }

package/lib/utils/validateInputBySchema.d.ts

@@ -1,3 +1,3 @@
-import { JSONSchema7 } from 'json-schema';
+import { StyleSchema } from '@dicebear/core';
 import { ArgumentsCamelCase } from 'yargs';
-export declare function validateInputBySchema(input: ArgumentsCamelCase<unknown>, schema: JSONSchema7): any;
+export declare function validateInputBySchema(input: ArgumentsCamelCase<unknown>, schema: StyleSchema): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dicebear",
-  "version": "5.0.0-alpha.33",
+  "version": "5.0.0-alpha.35",
   "private": false,
   "description": "CLI for DiceBear - An avatar library for designers and developers",
   "homepage": "https://github.com/dicebear/dicebear",
@@ -25,8 +25,8 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@dicebear/collection": "^5.0.0-alpha.33",
-    "@dicebear/core": "^5.0.0-alpha.33",
+    "@dicebear/collection": "^5.0.0-alpha.35",
+    "@dicebear/core": "^5.0.0-alpha.35",
     "@resvg/resvg-js": "^2.0.0",
     "ajv": "^8.11.0",
     "chalk": "^5.0.1",
@@ -34,7 +34,6 @@
     "cli-progress": "^3.10.0",
     "exiftool-vendored": "^16.3.0",
     "fs-extra": "^10.1.0",
-    "json-schema-merge-allof": "^0.8.1",
     "p-queue": "^7.2.0",
     "sharp": "^0.30.4",
     "update-notifier": "^5.1.0",
@@ -44,8 +43,6 @@
     "@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",
     "@types/yargs": "^17.0.10",
     "del-cli": "^4.0.1",
@@ -54,5 +51,5 @@
   "engines": {
     "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
   },
-  "gitHead": "88548ee882858c8871c477d83c3ed0bd227c64b0"
+  "gitHead": "e6f55ebe3a5b8a60394744d95533528bb8b119ef"
 }