@sprucelabs/schema 32.1.0 → 32.1.2

package/build/esm/fields/FileField.d.ts

@@ -7,5 +7,6 @@ export default class FileField extends AbstractField<FileFieldDefinition> {
     static readonly description = "A way to handle files. Supports mime-type lookups.";
     static generateTemplateDetails(options: FieldTemplateDetailOptions<FileFieldDefinition>): FieldTemplateDetails;
     validate(value: FileFieldValue, _?: ValidateOptions<FileFieldDefinition>): FieldError[];
+    private isValidType;
     toValueType<C extends boolean>(value: any, _options?: ToValueTypeOptions<FileFieldDefinition, C>): FileFieldValue;
 }

package/build/esm/fields/FileField.js

@@ -11,8 +11,8 @@ class FileField extends AbstractField {
         const acceptableTypes = (_b = (_a = this.definition.options) === null || _a === void 0 ? void 0 : _a.acceptableTypes) !== null && _b !== void 0 ? _b : [];
         if (value &&
             !value.base64 &&
-            acceptableTypes[0] !== '*' &&
-            acceptableTypes.indexOf(value.type) === -1) {
+            value.type &&
+            !this.isValidType(value.type)) {
             errors.push({
                 code: 'INVALID_PARAMETER',
                 name: this.name,
@@ -21,6 +21,15 @@ class FileField extends AbstractField {
         }
         return errors;
     }
+    isValidType(type) {
+        var _a, _b;
+        const types = (_b = (_a = this.definition.options) === null || _a === void 0 ? void 0 : _a.acceptableTypes) !== null && _b !== void 0 ? _b : [];
+        const typeParts = type.split('/');
+        const typeStarred = `${typeParts[0]}/*`;
+        return (types[0] === '*' ||
+            types.indexOf(type) !== -1 ||
+            types.indexOf(typeStarred) !== -1);
+    }
     toValueType(value, _options) {
         return value;
     }

package/build/esm/fields/FileField.types.d.ts

@@ -3,6 +3,7 @@ export declare const supportedFileTypes: readonly ["image/png", "image/svg+xml",
 export type SupportedFileType = (typeof supportedFileTypes)[number];
 export interface FileFieldValue {
     name: string;
+    id?: string;
     type?: SupportedFileType;
     uri?: string;
     base64?: string;

package/build/esm/fields/ImageField.types.d.ts

@@ -11,6 +11,7 @@ export declare const requiredImageSizes: readonly ["s", "m", "l", "xl", "*"];
 export type RequiredImageSize = (typeof requiredImageSizes)[number];
 export interface ImageFieldValue {
     name: string;
+    id?: string;
     base64?: string;
     type?: SupportedFileType;
     sUri?: string;

package/build/fields/FileField.d.ts

@@ -7,5 +7,6 @@ export default class FileField extends AbstractField<FileFieldDefinition> {
     static readonly description = "A way to handle files. Supports mime-type lookups.";
     static generateTemplateDetails(options: FieldTemplateDetailOptions<FileFieldDefinition>): FieldTemplateDetails;
     validate(value: FileFieldValue, _?: ValidateOptions<FileFieldDefinition>): FieldError[];
+    private isValidType;
     toValueType<C extends boolean>(value: any, _options?: ToValueTypeOptions<FileFieldDefinition, C>): FileFieldValue;
 }

package/build/fields/FileField.js

@@ -15,8 +15,8 @@ class FileField extends AbstractField_1.default {
         const acceptableTypes = this.definition.options?.acceptableTypes ?? [];
         if (value &&
             !value.base64 &&
-            acceptableTypes[0] !== '*' &&
-            acceptableTypes.indexOf(value.type) === -1) {
+            value.type &&
+            !this.isValidType(value.type)) {
             errors.push({
                 code: 'INVALID_PARAMETER',
                 name: this.name,
@@ -25,6 +25,14 @@ class FileField extends AbstractField_1.default {
         }
         return errors;
     }
+    isValidType(type) {
+        const types = this.definition.options?.acceptableTypes ?? [];
+        const typeParts = type.split('/');
+        const typeStarred = `${typeParts[0]}/*`;
+        return (types[0] === '*' ||
+            types.indexOf(type) !== -1 ||
+            types.indexOf(typeStarred) !== -1);
+    }
     toValueType(value, _options) {
         return value;
     }

package/build/fields/FileField.types.d.ts

@@ -3,6 +3,7 @@ export declare const supportedFileTypes: readonly ["image/png", "image/svg+xml",
 export type SupportedFileType = (typeof supportedFileTypes)[number];
 export interface FileFieldValue {
     name: string;
+    id?: string;
     type?: SupportedFileType;
     uri?: string;
     base64?: string;

package/build/fields/ImageField.types.d.ts

@@ -11,6 +11,7 @@ export declare const requiredImageSizes: readonly ["s", "m", "l", "xl", "*"];
 export type RequiredImageSize = (typeof requiredImageSizes)[number];
 export interface ImageFieldValue {
     name: string;
+    id?: string;
     base64?: string;
     type?: SupportedFileType;
     sUri?: string;

package/package.json

@@ -8,7 +8,7 @@
     "!build/__tests__",
     "esm"
   ],
-  "version": "32.1.0",
+  "version": "32.1.2",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "module": "./build/esm/index.js",
@@ -59,14 +59,14 @@
   },
   "dependencies": {
     "@sprucelabs/error": "^7.0.29",
-    "@sprucelabs/test-utils": "^6.0.44",
+    "@sprucelabs/test-utils": "^6.0.45",
     "email-validator": "^2.0.4",
     "just-safe-get": "^4.2.0",
     "just-safe-set": "^4.2.1"
   },
   "devDependencies": {
     "@sprucelabs/esm-postbuild": "^7.0.19",
-    "@sprucelabs/jest-json-reporter": "^9.0.30",
+    "@sprucelabs/jest-json-reporter": "^9.0.31",
     "@sprucelabs/resolve-path-aliases": "^3.0.16",
     "@sprucelabs/semantic-release": "^5.0.2",
     "@sprucelabs/test": "^10.0.13",