@devvit/public-api 0.11.0-next-2024-07-29-74c4bb837.0 → 0.11.0-next-2024-07-30-8f65a4fa6.0

package/devvit/internals/helpers/settingsUtils.d.ts

@@ -1,5 +1,8 @@
 import type { Metadata, ValidateFormRequest } from '@devvit/protos';
 import { ValidateFormResponse } from '@devvit/protos';
-import type { SettingsFormField } from '../../../types/settings.js';
+import type { SettingsFormField, SettingsFormFieldGroup } from '../../../types/settings.js';
+type SettingsPlainField = Exclude<SettingsFormField, SettingsFormFieldGroup>;
+export declare function extractSettingsFields(settings: SettingsFormField[]): SettingsPlainField[];
 export declare function onValidateFormHelper(req: ValidateFormRequest, settings: SettingsFormField[] | undefined, metadata: Metadata): Promise<ValidateFormResponse>;
+export {};
 //# sourceMappingURL=settingsUtils.d.ts.map

package/devvit/internals/helpers/settingsUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settingsUtils.d.ts","sourceRoot":"","sources":["../../../../src/devvit/internals/helpers/settingsUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAGtD,OAAO,KAAK,EAAqB,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAGvF,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,mBAAmB,EACxB,QAAQ,EAAE,iBAAiB,EAAE,GAAG,SAAS,EACzC,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,oBAAoB,CAAC,CAoD/B"}
+{"version":3,"file":"settingsUtils.d.ts","sourceRoot":"","sources":["../../../../src/devvit/internals/helpers/settingsUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAGtD,OAAO,KAAK,EAEV,iBAAiB,EACjB,sBAAsB,EACvB,MAAM,4BAA4B,CAAC;AAGpC,KAAK,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAC;AAE7E,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,iBAAiB,EAAE,GAAG,kBAAkB,EAAE,CAOzF;AAED,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,mBAAmB,EACxB,QAAQ,EAAE,iBAAiB,EAAE,GAAG,SAAS,EACzC,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,oBAAoB,CAAC,CA8C/B"}

package/devvit/internals/helpers/settingsUtils.js

@@ -2,6 +2,14 @@ import { ValidateFormResponse } from '@devvit/protos';
 import { makeAPIClients } from '../../../apis/makeAPIClients.js';
 import { getFormValues } from '../../../apis/ui/helpers/getFormValues.js';
 import { getContextFromMetadata } from '../context.js';
+export function extractSettingsFields(settings) {
+    return settings.flatMap((field) => {
+        if (field.type === 'group') {
+            return extractSettingsFields(field.fields);
+        }
+        return field;
+    });
+}
 export async function onValidateFormHelper(req, settings, metadata) {
     if (!settings) {
         throw new Error('Settings were not defined.');
@@ -11,16 +19,11 @@ export async function onValidateFormHelper(req, settings, metadata) {
         errors: {},
     });
     const formValues = getFormValues(req.fieldValues);
-    const flattendFields = settings.flatMap((field) => {
-        if (field.type === 'group') {
-            return field.fields;
-        }
-        return field;
-    });
+    const flattendFields = extractSettingsFields(settings);
     await Promise.all(flattendFields.map(async (field) => {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const fieldName = field.name;
-        if (fieldName && field.type !== 'group' && field.onValidate) {
+        if (fieldName && field.onValidate) {
             const value = formValues[fieldName];
             const validator = field.onValidate;
             const context = Object.assign(makeAPIClients({

package/devvit/internals/helpers/settingsUtils.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"settingsUtils.test.d.ts","sourceRoot":"","sources":["../../../../src/devvit/internals/helpers/settingsUtils.test.ts"],"names":[],"mappings":""}

package/meta.json

@@ -11686,7 +11686,7 @@
       "format": "esm"
     },
     "src/devvit/internals/helpers/settingsUtils.ts": {
-      "bytes": 1828,
+      "bytes": 2073,
       "imports": [
         {
           "path": "../protos/dist/index.js",
@@ -14331,7 +14331,7 @@
           "bytesInOutput": 1701
         },
         "src/devvit/internals/helpers/settingsUtils.ts": {
-          "bytesInOutput": 1229
+          "bytesInOutput": 1319
         },
         "src/devvit/internals/app-settings.ts": {
           "bytesInOutput": 614
@@ -14508,7 +14508,7 @@
           "bytesInOutput": 4358
         }
       },
-      "bytes": 14784775
+      "bytes": 14785277
     }
   }
 }

package/meta.min.json

@@ -3015,7 +3015,7 @@
       "format": "esm"
     },
     "src/devvit/internals/helpers/settingsUtils.ts": {
-      "bytes": 1828,
+      "bytes": 2073,
       "imports": [
         {
           "path": "@devvit/protos",
@@ -4716,7 +4716,7 @@
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 1185976
+      "bytes": 1186306
     },
     "dist/public-api.min.js": {
       "imports": [
@@ -5293,7 +5293,7 @@
           "bytesInOutput": 33
         },
         "src/devvit/internals/helpers/settingsUtils.ts": {
-          "bytesInOutput": 480
+          "bytesInOutput": 494
         },
         "src/devvit/internals/blocks/useChannel.ts": {
           "bytesInOutput": 1537
@@ -5527,7 +5527,7 @@
           "bytesInOutput": 2083
         }
       },
-      "bytes": 251828
+      "bytes": 251842
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devvit/public-api",
-  "version": "0.11.0-next-2024-07-29-74c4bb837.0",
+  "version": "0.11.0-next-2024-07-30-8f65a4fa6.0",
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
@@ -30,8 +30,8 @@
   },
   "types": "./index.d.ts",
   "dependencies": {
-    "@devvit/protos": "0.11.0-next-2024-07-29-74c4bb837.0",
-    "@devvit/shared-types": "0.11.0-next-2024-07-29-74c4bb837.0",
+    "@devvit/protos": "0.11.0-next-2024-07-30-8f65a4fa6.0",
+    "@devvit/shared-types": "0.11.0-next-2024-07-30-8f65a4fa6.0",
     "base64-js": "1.5.1",
     "clone-deep": "4.0.1",
     "core-js": "3.27.2",
@@ -39,9 +39,9 @@
   },
   "devDependencies": {
     "@ampproject/filesize": "4.3.0",
-    "@devvit/eslint-config": "0.11.0-next-2024-07-29-74c4bb837.0",
-    "@devvit/repo-tools": "0.11.0-next-2024-07-29-74c4bb837.0",
-    "@devvit/tsconfig": "0.11.0-next-2024-07-29-74c4bb837.0",
+    "@devvit/eslint-config": "0.11.0-next-2024-07-30-8f65a4fa6.0",
+    "@devvit/repo-tools": "0.11.0-next-2024-07-30-8f65a4fa6.0",
+    "@devvit/tsconfig": "0.11.0-next-2024-07-30-8f65a4fa6.0",
     "@microsoft/api-extractor": "7.41.0",
     "@reddit/faceplate-ui": "11.3.3",
     "@types/clone-deep": "4.0.1",
@@ -64,5 +64,5 @@
     }
   },
   "source": "./src/index.ts",
-  "gitHead": "68efa1e336dee06ac482d1932fbb0c97c34ce058"
+  "gitHead": "b6e254fbefbe5506377a5892bffaff2d10ce1f9c"
 }