@sprucelabs/spruce-form-utils 17.2.217 → 18.0.1

package/build/completing/FormPlayerCard.vc.js

@@ -1,25 +1,21 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const heartwood_view_controllers_1 = require("@sprucelabs/heartwood-view-controllers");
 const schema_1 = require("@sprucelabs/schema");
 const spruce_image_utils_1 = require("@sprucelabs/spruce-image-utils");
 class FormPlayerCardViewController extends heartwood_view_controllers_1.AbstractViewController {
+    swipeVc;
+    static id = 'form-player-card';
+    onChangeHandler;
+    builderSource;
+    shouldIgnoreChanges = false;
+    router;
+    onSaveAndBeDoneHandler;
+    uploader;
+    uploads = {};
     constructor(options) {
         super(options);
-        this.shouldIgnoreChanges = false;
-        this.uploads = {};
-        const { onChange, isBusy, id, onSaveAndBeDone } = options, builderSource = __rest(options, ["onChange", "isBusy", "id", "onSaveAndBeDone"]);
+        const { onChange, isBusy, id, onSaveAndBeDone, ...builderSource } = options;
         this.builderSource = (0, heartwood_view_controllers_1.removeUniversalViewOptions)(builderSource);
         this.onSaveAndBeDoneHandler = onSaveAndBeDone;
         this.swipeVc = this.SwipeVc(id, this.builderSource);
@@ -44,9 +40,8 @@ class FormPlayerCardViewController extends heartwood_view_controllers_1.Abstract
         this.updateFooter();
     }
     renderFooter() {
-        var _a, _b, _c, _d;
-        const totalPages = (_b = (_a = this.builderSource.pages) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
-        const currentPage = (_d = (_c = this.swipeVc) === null || _c === void 0 ? void 0 : _c.getPresentSlide()) !== null && _d !== void 0 ? _d : 0;
+        const totalPages = this.builderSource.pages?.length ?? 0;
+        const currentPage = this.swipeVc?.getPresentSlide() ?? 0;
         const buttons = [
             {
                 id: 'saveProgress',
@@ -82,24 +77,22 @@ class FormPlayerCardViewController extends heartwood_view_controllers_1.Abstract
         });
     }
     async handleClickSaveAndDone() {
-        var _a, _b;
         if (this.onSaveAndBeDoneHandler) {
-            await ((_a = this.onSaveAndBeDoneHandler) === null || _a === void 0 ? void 0 : _a.call(this));
+            await this.onSaveAndBeDoneHandler?.();
             return;
         }
         await this.alert({
             message: `Progress saved, lets get outa here! 🚀`,
             style: 'success',
         });
-        await ((_b = this.router) === null || _b === void 0 ? void 0 : _b.redirect('profile.root'));
+        await this.router?.redirect('profile.root');
     }
     async handleClickNext() {
         await this.swipeVc.jumpToSlide(this.swipeVc.getPresentSlide() + 1);
     }
     renderHeader(options) {
-        var _a;
         return {
-            title: (_a = options.title) !== null && _a !== void 0 ? _a : 'Loading your form...',
+            title: options.title ?? 'Loading your form...',
             subtitle: options.subtitle,
         };
     }
@@ -107,37 +100,40 @@ class FormPlayerCardViewController extends heartwood_view_controllers_1.Abstract
         this.swipeVc.setIsBusy(isLoading);
     }
     renderSlides(options) {
-        var _a, _b;
-        const slides = (_b = (_a = options.pages) === null || _a === void 0 ? void 0 : _a.map((_a) => {
-            var { title } = _a, form = __rest(_a, ["title"]);
-            const formVc = this.Controller('form', Object.assign(Object.assign({}, form), { shouldShowSubmitControls: false, onChange: async () => {
+        const slides = options.pages?.map(({ title, ...form }) => {
+            const formVc = this.Controller('form', {
+                ...form,
+                shouldShowSubmitControls: false,
+                onChange: async () => {
                     await this.handleFormChange(formVc);
-                } }));
+                },
+            });
             return {
                 title,
                 form: formVc.render(),
             };
-        })) !== null && _b !== void 0 ? _b : [];
+        }) ?? [];
         return slides;
     }
     async handleFormChange(formVc) {
-        var _a;
         const schema = formVc.getSchema();
         for (const [name, field] of Object.entries(schema.fields)) {
             if (field.type === 'image' && formVc.isFieldRendering(name)) {
                 const value = formVc.getValue(name);
-                if (value && ((_a = this.uploads[name]) === null || _a === void 0 ? void 0 : _a.original) !== value.base64) {
+                if (value && this.uploads[name]?.original !== value.base64) {
                     const file = await this.uploader.upload(value);
-                    this.uploads[name] = { original: value.base64, uploaded: file };
+                    this.uploads[name] = {
+                        original: value.base64,
+                        uploaded: file,
+                    };
                 }
             }
         }
         await this.optionallyInvokeChangeHandler();
     }
     async optionallyInvokeChangeHandler() {
-        var _a;
         if (!this.shouldIgnoreChanges) {
-            await ((_a = this.onChangeHandler) === null || _a === void 0 ? void 0 : _a.call(this, { values: this.getValues() }));
+            await this.onChangeHandler?.({ values: this.getValues() });
         }
     }
     getHasCriticalError() {
@@ -153,11 +149,11 @@ class FormPlayerCardViewController extends heartwood_view_controllers_1.Abstract
         return this.swipeVc;
     }
     async load(options) {
-        const { router } = options, source = __rest(options, ["router"]);
+        const { router, ...source } = options;
         const { title, subtitle } = this.renderHeader(source);
         this.router = router;
-        this.swipeVc.setHeaderTitle(title !== null && title !== void 0 ? title : null);
-        this.swipeVc.setHeaderSubtitle(subtitle !== null && subtitle !== void 0 ? subtitle : null);
+        this.swipeVc.setHeaderTitle(title ?? null);
+        this.swipeVc.setHeaderSubtitle(subtitle ?? null);
         if (source.pages) {
             this.swipeVc.setSections(this.renderSlides(source));
         }
@@ -198,9 +194,9 @@ class FormPlayerCardViewController extends heartwood_view_controllers_1.Abstract
         return values;
     }
     getFormVcs() {
-        var _a;
         const slides = this.swipeVc.getSlides();
-        return ((_a = slides === null || slides === void 0 ? void 0 : slides.map((s) => { var _a; return (_a = s.form) === null || _a === void 0 ? void 0 : _a.controller; })) !== null && _a !== void 0 ? _a : []);
+        return (slides?.map((s) => s.form?.controller) ??
+            []);
     }
     getFormVc(idx) {
         const formVc = this.getFormVcs()[idx];
@@ -220,5 +216,4 @@ class FormPlayerCardViewController extends heartwood_view_controllers_1.Abstract
         return this.swipeVc.render();
     }
 }
-FormPlayerCardViewController.id = 'form-player-card';
 exports.default = FormPlayerCardViewController;

package/build/completing/formCompletionCalculator.js

@@ -23,16 +23,15 @@ function validateOptions(pages, values) {
 }
 const formCompletionCalculator = {
     calculate(pages, values) {
-        var _a, _b, _c, _d;
         validateOptions(pages, values);
         const requiredFields = [];
         let totalFields = 0;
         for (const page of pages) {
-            const fields = (_a = page.schema.fields) !== null && _a !== void 0 ? _a : {};
+            const fields = page.schema.fields ?? {};
             for (const section of page.sections) {
-                for (const field of (_b = section.fields) !== null && _b !== void 0 ? _b : []) {
-                    const fieldKey = (_c = field.name) !== null && _c !== void 0 ? _c : field;
-                    const f = (_d = fields[fieldKey]) !== null && _d !== void 0 ? _d : {};
+                for (const field of section.fields ?? []) {
+                    const fieldKey = field.name ?? field;
+                    const f = fields[fieldKey] ?? {};
                     if (f.isRequired) {
                         totalFields++;
                         requiredFields.push(fieldKey);
@@ -45,7 +44,7 @@ const formCompletionCalculator = {
         }
         let totalAnswered = 0;
         for (const value of values) {
-            totalAnswered += Object.keys(value !== null && value !== void 0 ? value : {}).filter((k) => {
+            totalAnswered += Object.keys(value ?? {}).filter((k) => {
                 return !!value[k] && requiredFields.indexOf(k) !== -1;
             }).length;
         }

package/build/esm/completing/FormPlayerCard.vc.js

@@ -142,7 +142,10 @@ class FormPlayerCardViewController extends AbstractViewController {
                     const value = formVc.getValue(name);
                     if (value && ((_a = this.uploads[name]) === null || _a === void 0 ? void 0 : _a.original) !== value.base64) {
                         const file = yield this.uploader.upload(value);
-                        this.uploads[name] = { original: value.base64, uploaded: file };
+                        this.uploads[name] = {
+                            original: value.base64,
+                            uploaded: file,
+                        };
                     }
                 }
             }

package/build/esm/viewControllers/FormCard.vc.js

@@ -23,7 +23,9 @@ import { assertOptions, } from '@sprucelabs/schema';
 class FormCardViewController extends AbstractViewController {
     constructor(options) {
         super(options);
-        const _a = assertOptions(options, ['schema']), { fields, id, header } = _a, form = __rest(_a, ["fields", "id", "header"]);
+        const _a = assertOptions(options, [
+            'schema',
+        ]), { fields, id, header } = _a, form = __rest(_a, ["fields", "id", "header"]);
         if (!fields && !form.sections) {
             assertOptions(options, ['sections', 'fields'], 'You have to supply either fields or sections to your form card!');
         }

package/build/viewControllers/FormCard.vc.js

@@ -1,23 +1,17 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildFormCard = void 0;
 const heartwood_view_controllers_1 = require("@sprucelabs/heartwood-view-controllers");
 const schema_1 = require("@sprucelabs/schema");
 class FormCardViewController extends heartwood_view_controllers_1.AbstractViewController {
+    static id = 'card';
+    formVc;
+    cardVc;
     constructor(options) {
         super(options);
-        const _a = (0, schema_1.assertOptions)(options, ['schema']), { fields, id, header } = _a, form = __rest(_a, ["fields", "id", "header"]);
+        const { fields, id, header, ...form } = (0, schema_1.assertOptions)(options, [
+            'schema',
+        ]);
         if (!fields && !form.sections) {
             (0, schema_1.assertOptions)(options, ['sections', 'fields'], 'You have to supply either fields or sections to your form card!');
         }
@@ -28,13 +22,16 @@ class FormCardViewController extends heartwood_view_controllers_1.AbstractViewCo
         this.cardVc = this.CardVc({ id, header });
     }
     CardVc(options) {
-        return this.Controller('card', Object.assign(Object.assign({}, options), { body: {
+        return this.Controller('card', {
+            ...options,
+            body: {
                 sections: [
                     {
                         form: this.formVc.render(),
                     },
                 ],
-            } }));
+            },
+        });
     }
     getIsValid() {
         return this.formVc.isValid();
@@ -47,7 +44,9 @@ class FormCardViewController extends heartwood_view_controllers_1.AbstractViewCo
         return errors;
     }
     async setValues(values) {
-        await this.formVc.setValues(Object.assign({}, values));
+        await this.formVc.setValues({
+            ...values,
+        });
     }
     getValues() {
         return this.formVc.getValues();
@@ -62,7 +61,6 @@ class FormCardViewController extends heartwood_view_controllers_1.AbstractViewCo
         return this.cardVc.render();
     }
 }
-FormCardViewController.id = 'card';
 exports.default = FormCardViewController;
 function buildFormCard(options) {
     return options;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@sprucelabs/spruce-form-utils",
 	"description": "Support for working with forms and Sprucebot. 📄",
-	"version": "17.2.217",
+	"version": "18.0.1",
 	"skill": {
 		"namespace": "forms"
 	},