@aemforms/af-core 0.22.69 → 0.22.71

package/esm/afb-runtime.js

@@ -1163,8 +1163,7 @@ class Scriptable extends BaseNode {
                 if (prop === Symbol.toStringTag) {
                     return 'Object';
                 }
-                prop = prop;
-                if (prop.startsWith('$')) {
+                if (typeof prop === 'string' && prop.startsWith('$')) {
                     const retValue = target.self[prop];
                     if (retValue instanceof BaseNode) {
                         return retValue.getRuleNode();
@@ -1250,7 +1249,7 @@ class Container extends Scriptable {
     _itemTemplate = null;
     fieldFactory;
     constructor(json, _options) {
-        super(json, { form: _options.form, parent: _options.parent });
+        super(json, { form: _options.form, parent: _options.parent, mode: _options.mode });
         this.fieldFactory = _options.fieldFactory;
     }
     _getDefaults() {
@@ -1360,11 +1359,7 @@ class Container extends Scriptable {
         };
     }
     _createChild(child, options) {
-        const { parent = this } = options;
-        return this.fieldFactory.createField(child, {
-            form: options.form,
-            parent
-        });
+        return this.fieldFactory.createField(child, options);
     }
     walkSiteContainerItems(x) {
         return Object.fromEntries(Object.entries(x[':items']).map(([key, value]) => {
@@ -1416,7 +1411,7 @@ class Container extends Scriptable {
             });
         }
     }
-    _addChild(itemJson, index, cloneIds = false) {
+    _addChild(itemJson, index, cloneIds = false, mode = 'create') {
         let nonTransparentParent = this;
         while (nonTransparentParent != null && nonTransparentParent.isTransparent()) {
             nonTransparentParent = nonTransparentParent.parent;
@@ -1429,7 +1424,7 @@ class Container extends Scriptable {
             index,
             ...deepClone(itemJson, cloneIds ? () => { return form.getUniqueId(); } : undefined)
         };
-        const retVal = this._createChild(itemTemplate, { parent: this, form: this.form });
+        const retVal = this._createChild(itemTemplate, { parent: this, form: this.form, mode });
         itemJson.id = retVal.id;
         this.form.fieldAdded(retVal);
         this._addChildToRuleNode(retVal, { parent: nonTransparentParent });
@@ -1485,7 +1480,7 @@ class Container extends Scriptable {
                         itemTemplate = deepClone(items[i]);
                         itemTemplate.repeatable = undefined;
                     }
-                    child = this._addChild(itemTemplate, undefined, i > this._jsonModel.items.length - 1);
+                    child = this._addChild(itemTemplate, undefined, i > this._jsonModel.items.length - 1, mode);
                 }
                 else {
                     child = this._addChild(this._itemTemplate, undefined, i > this._jsonModel.items.length - 1);
@@ -1502,7 +1497,7 @@ class Container extends Scriptable {
                     this._initializeSiteContainer(item);
                 }
                 else if (this.isAFormField(item)) {
-                    const child = this._addChild(item);
+                    const child = this._addChild(item, undefined, false, mode);
                     child._initialize(mode);
                 }
                 else {
@@ -2866,9 +2861,11 @@ class RuleEngine {
 class Fieldset extends Container {
     constructor(params, _options) {
         super(params, _options);
-        this._applyDefaults();
-        this.queueEvent(new Initialize());
-        this.queueEvent(new ExecuteRule());
+        if (_options.mode !== 'restore') {
+            this._applyDefaults();
+            this.queueEvent(new Initialize());
+            this.queueEvent(new ExecuteRule());
+        }
     }
     _getDefaults() {
         return {
@@ -3211,9 +3208,11 @@ const validTypes = ['string', 'number', 'integer', 'boolean', 'file', 'string[]'
 class Field extends Scriptable {
     constructor(params, _options) {
         super(params, _options);
-        this._applyDefaults();
-        this.queueEvent(new Initialize());
-        this.queueEvent(new ExecuteRule());
+        if (_options.mode !== 'restore') {
+            this._applyDefaults();
+            this.queueEvent(new Initialize());
+            this.queueEvent(new ExecuteRule());
+        }
     }
     _ruleNodeReference = [];
     _initialize() {

package/esm/types/src/BaseNode.d.ts

@@ -23,6 +23,7 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     constructor(params: T, _options: {
         form: FormModel;
         parent: ContainerModel;
+        mode?: 'create' | 'restore';
     });
     abstract value: Primitives;
     abstract reset(): any;

package/esm/types/src/CheckboxGroup.d.ts

@@ -1,9 +1,10 @@
 import Field from './Field';
-import { ContainerModel, FieldJson, FormModel } from './types/index';
+import { ContainerModel, FieldJson, FormCreationMode, FormModel } from './types/index';
 declare class CheckboxGroup extends Field {
     constructor(params: FieldJson, _options: {
         form: FormModel;
         parent: ContainerModel;
+        mode: FormCreationMode;
     });
     protected _getFallbackType(): string | undefined;
     protected _getDefaults(): {

package/esm/types/src/Container.d.ts

@@ -10,7 +10,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
         form: FormModel;
         parent: ContainerModel;
         fieldFactory: IFormFieldFactory;
-        mode: 'create' | 'restore';
+        mode?: 'create' | 'restore';
     });
     protected _getDefaults(): any;
     ruleNodeReference(): any;

package/esm/types/src/Field.d.ts

@@ -6,6 +6,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     constructor(params: FieldJson, _options: {
         form: FormModel;
         parent: ContainerModel;
+        mode?: 'create' | 'restore';
     });
     private _ruleNodeReference;
     _initialize(): any;

package/esm/types/src/Fieldset.d.ts

@@ -5,7 +5,7 @@ export declare class Fieldset extends Container<FieldsetJson> implements Fieldse
         form: FormModel;
         parent: ContainerModel;
         fieldFactory: IFormFieldFactory;
-        mode: FormCreationMode;
+        mode?: FormCreationMode;
     });
     protected _getDefaults(): any;
     private _applyDefaults;

package/lib/BaseNode.d.ts

@@ -23,6 +23,7 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     constructor(params: T, _options: {
         form: FormModel;
         parent: ContainerModel;
+        mode?: 'create' | 'restore';
     });
     abstract value: Primitives;
     abstract reset(): any;

package/lib/CheckboxGroup.d.ts

@@ -1,9 +1,10 @@
 import Field from './Field';
-import { ContainerModel, FieldJson, FormModel } from './types/index';
+import { ContainerModel, FieldJson, FormCreationMode, FormModel } from './types/index';
 declare class CheckboxGroup extends Field {
     constructor(params: FieldJson, _options: {
         form: FormModel;
         parent: ContainerModel;
+        mode: FormCreationMode;
     });
     protected _getFallbackType(): string | undefined;
     protected _getDefaults(): {

package/lib/Container.d.ts

@@ -10,7 +10,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
         form: FormModel;
         parent: ContainerModel;
         fieldFactory: IFormFieldFactory;
-        mode: 'create' | 'restore';
+        mode?: 'create' | 'restore';
     });
     protected _getDefaults(): any;
     ruleNodeReference(): any;

package/lib/Container.js

@@ -19,7 +19,7 @@ const notifyChildrenAttributes = [
 ];
 class Container extends Scriptable_1.default {
     constructor(json, _options) {
-        super(json, { form: _options.form, parent: _options.parent });
+        super(json, { form: _options.form, parent: _options.parent, mode: _options.mode });
         this._children = [];
         this._itemTemplate = null;
         this._activeChild = null;
@@ -115,11 +115,7 @@ class Container extends Scriptable_1.default {
         } : {})), { items: this.getItemsState(isRepeatableChild, forRestore), enabled: this.enabled, readOnly: this.readOnly });
     }
     _createChild(child, options) {
-        const { parent = this } = options;
-        return this.fieldFactory.createField(child, {
-            form: options.form,
-            parent
-        });
+        return this.fieldFactory.createField(child, options);
     }
     walkSiteContainerItems(x) {
         return Object.fromEntries(Object.entries(x[':items']).map(([key, value]) => {
@@ -165,7 +161,7 @@ class Container extends Scriptable_1.default {
             });
         }
     }
-    _addChild(itemJson, index, cloneIds = false) {
+    _addChild(itemJson, index, cloneIds = false, mode = 'create') {
         let nonTransparentParent = this;
         while (nonTransparentParent != null && nonTransparentParent.isTransparent()) {
             nonTransparentParent = nonTransparentParent.parent;
@@ -175,7 +171,7 @@ class Container extends Scriptable_1.default {
         }
         const form = this.form;
         const itemTemplate = Object.assign({ index }, (0, JsonUtils_1.deepClone)(itemJson, cloneIds ? () => { return form.getUniqueId(); } : undefined));
-        const retVal = this._createChild(itemTemplate, { parent: this, form: this.form });
+        const retVal = this._createChild(itemTemplate, { parent: this, form: this.form, mode });
         itemJson.id = retVal.id;
         this.form.fieldAdded(retVal);
         this._addChildToRuleNode(retVal, { parent: nonTransparentParent });
@@ -231,7 +227,7 @@ class Container extends Scriptable_1.default {
                         itemTemplate = (0, JsonUtils_1.deepClone)(items[i]);
                         itemTemplate.repeatable = undefined;
                     }
-                    child = this._addChild(itemTemplate, undefined, i > this._jsonModel.items.length - 1);
+                    child = this._addChild(itemTemplate, undefined, i > this._jsonModel.items.length - 1, mode);
                 }
                 else {
                     child = this._addChild(this._itemTemplate, undefined, i > this._jsonModel.items.length - 1);
@@ -248,7 +244,7 @@ class Container extends Scriptable_1.default {
                     this._initializeSiteContainer(item);
                 }
                 else if (this.isAFormField(item)) {
-                    const child = this._addChild(item);
+                    const child = this._addChild(item, undefined, false, mode);
                     child._initialize(mode);
                 }
                 else {

package/lib/Field.d.ts

@@ -6,6 +6,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     constructor(params: FieldJson, _options: {
         form: FormModel;
         parent: ContainerModel;
+        mode?: 'create' | 'restore';
     });
     private _ruleNodeReference;
     _initialize(): any;

package/lib/Field.js

@@ -24,9 +24,11 @@ class Field extends Scriptable_1.default {
     constructor(params, _options) {
         super(params, _options);
         this._ruleNodeReference = [];
-        this._applyDefaults();
-        this.queueEvent(new Events_1.Initialize());
-        this.queueEvent(new Events_1.ExecuteRule());
+        if (_options.mode !== 'restore') {
+            this._applyDefaults();
+            this.queueEvent(new Events_1.Initialize());
+            this.queueEvent(new Events_1.ExecuteRule());
+        }
     }
     _initialize() {
         super._initialize();

package/lib/Fieldset.d.ts

@@ -5,7 +5,7 @@ export declare class Fieldset extends Container<FieldsetJson> implements Fieldse
         form: FormModel;
         parent: ContainerModel;
         fieldFactory: IFormFieldFactory;
-        mode: FormCreationMode;
+        mode?: FormCreationMode;
     });
     protected _getDefaults(): any;
     private _applyDefaults;

package/lib/Fieldset.js

@@ -9,9 +9,11 @@ const Events_1 = require("./controller/Events");
 class Fieldset extends Container_1.default {
     constructor(params, _options) {
         super(params, _options);
-        this._applyDefaults();
-        this.queueEvent(new Events_1.Initialize());
-        this.queueEvent(new Events_1.ExecuteRule());
+        if (_options.mode !== 'restore') {
+            this._applyDefaults();
+            this.queueEvent(new Events_1.Initialize());
+            this.queueEvent(new Events_1.ExecuteRule());
+        }
     }
     _getDefaults() {
         return Object.assign(Object.assign({}, super._getDefaults()), { visible: true, required: false, label: {

package/lib/Scriptable.js

@@ -92,8 +92,7 @@ class Scriptable extends BaseNode_1.BaseNode {
                 if (prop === Symbol.toStringTag) {
                     return 'Object';
                 }
-                prop = prop;
-                if (prop.startsWith('$')) {
+                if (typeof prop === 'string' && prop.startsWith('$')) {
                     const retValue = target.self[prop];
                     if (retValue instanceof BaseNode_1.BaseNode) {
                         return retValue.getRuleNode();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.69",
+  "version": "0.22.71",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "0.1.50",
-    "@aemforms/af-formatters": "^0.22.69"
+    "@aemforms/af-formatters": "^0.22.71"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",