@anglr/common 11.2.0-beta.20220301105549 → 11.2.0-beta.20220301105854
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/changelog.md +4 -0
- package/es2015/forms/src/misc/formModel/decorators/modelPropertyMetadata.decorator.js +1 -1
- package/es2015/forms/src/misc/formModel/decorators/modelPropertyMetadata.decorator.js.map +1 -1
- package/es2020/forms/src/misc/formModel/decorators/modelPropertyMetadata.decorator.js +1 -1
- package/es2020/forms/src/misc/formModel/decorators/modelPropertyMetadata.decorator.js.map +1 -1
- package/package.json +1 -1
- package/version.bak +1 -1
package/changelog.md
CHANGED
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
## Version 11.2.0 (2022-03-01)
|
|
4
4
|
|
|
5
|
+
### Bug Fixes
|
|
6
|
+
|
|
7
|
+
- fixed `ModelPropertyMetadata` decorator metadata merging (previously multiple usages of decorator caused rewriting values with default value)
|
|
8
|
+
|
|
5
9
|
### Features
|
|
6
10
|
|
|
7
11
|
- new `PositionToDirective` directive, that sets position of attached element relative to provided element
|
|
@@ -20,7 +20,7 @@ export function ModelPropertyMetadata(metadata) {
|
|
|
20
20
|
const originValidators = (_b = (_a = trgt.ɵControlsMetadata[propertyKey]) === null || _a === void 0 ? void 0 : _a.validators) !== null && _b !== void 0 ? _b : [];
|
|
21
21
|
const originAsyncValidators = (_d = (_c = trgt.ɵControlsMetadata[propertyKey]) === null || _c === void 0 ? void 0 : _c.asyncValidators) !== null && _d !== void 0 ? _d : [];
|
|
22
22
|
//merge all other values
|
|
23
|
-
trgt.ɵControlsMetadata[propertyKey] = Object.assign(Object.assign(Object.assign({}, trgt.ɵControlsMetadata[propertyKey]),
|
|
23
|
+
trgt.ɵControlsMetadata[propertyKey] = Object.assign(Object.assign(Object.assign({}, ɵDefaultPropertyMetadata), trgt.ɵControlsMetadata[propertyKey]), metadata);
|
|
24
24
|
//merge validators
|
|
25
25
|
const propertyMetadata = trgt.ɵControlsMetadata[propertyKey];
|
|
26
26
|
propertyMetadata.validators =
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelPropertyMetadata.decorator.js","sourceRoot":"","sources":["../../../../../../forms/src/misc/formModel/decorators/modelPropertyMetadata.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAIlD,OAAO,EAAC,wBAAwB,EAAC,MAAM,kBAAkB,CAAC;AAE1D;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CACe,QAA+C;IAE/F,OAAO,UAAS,MAAc,EAAE,WAA0B;;QAEtD,MAAM,IAAI,GAAG,MAAwC,CAAC;QAEtD,IAAG,CAAC,IAAI,CAAC,iBAAiB,EAC1B;YACI,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAyB,mBAAmB,CAAC,EAC/E;gBACI,KAAK,EAAE,EAAE;gBACT,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,KAAK;gBACjB,YAAY,EAAE,KAAK;aACtB,CAAC,CAAC;SACN;QAED,yBAAyB;QACzB,MAAM,gBAAgB,GAAG,MAAA,MAAA,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC,0CAAE,UAAU,mCAAI,EAAE,CAAC;QAC/F,MAAM,qBAAqB,GAAG,MAAA,MAAA,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC,0CAAE,eAAe,mCAAI,EAAE,CAAC;QAEzG,wBAAwB;QACxB,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC,iDAE5C,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC,GACnD,
|
|
1
|
+
{"version":3,"file":"modelPropertyMetadata.decorator.js","sourceRoot":"","sources":["../../../../../../forms/src/misc/formModel/decorators/modelPropertyMetadata.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAIlD,OAAO,EAAC,wBAAwB,EAAC,MAAM,kBAAkB,CAAC;AAE1D;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CACe,QAA+C;IAE/F,OAAO,UAAS,MAAc,EAAE,WAA0B;;QAEtD,MAAM,IAAI,GAAG,MAAwC,CAAC;QAEtD,IAAG,CAAC,IAAI,CAAC,iBAAiB,EAC1B;YACI,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAyB,mBAAmB,CAAC,EAC/E;gBACI,KAAK,EAAE,EAAE;gBACT,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,KAAK;gBACjB,YAAY,EAAE,KAAK;aACtB,CAAC,CAAC;SACN;QAED,yBAAyB;QACzB,MAAM,gBAAgB,GAAG,MAAA,MAAA,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC,0CAAE,UAAU,mCAAI,EAAE,CAAC;QAC/F,MAAM,qBAAqB,GAAG,MAAA,MAAA,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC,0CAAE,eAAe,mCAAI,EAAE,CAAC;QAEzG,wBAAwB;QACxB,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC,iDAE5C,wBAAwB,GACxB,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC,GACnD,QAAQ,CACd,CAAC;QAEF,kBAAkB;QAClB,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC,CAAC;QAE7E,gBAAgB,CAAC,UAAU;YAC3B;gBACI,GAAG,gBAAgB;gBACnB,GAAG,gBAAgB,CAAC,UAAU;aACjC,CAAC;QAEF,gBAAgB,CAAC,eAAe;YAChC;gBACI,GAAG,qBAAqB;gBACxB,GAAG,gBAAgB,CAAC,eAAe;aACtC,CAAC;IACN,CAAC,CAAC;AACN,CAAC","sourcesContent":["import {Dictionary, nameof} from '@jscrpt/common';\n\nimport {ModelDecoratorMetadata} from '../interfaces/modelDecoratorMetadata';\nimport {ModelPropertyDecoratorMetadata} from '../interfaces/modelPropertyDecoratorMetadata';\nimport {ɵDefaultPropertyMetadata} from '../misc/defaults';\n\n/**\n * Defines metadata for model property\n * @param metadata - Metadata for model property, used for creating form\n */\nexport function ModelPropertyMetadata<TArgs extends Dictionary<any> = any,\n TModel = any>(metadata: ModelPropertyDecoratorMetadata<TArgs>): PropertyDecorator\n{\n return function(target: Object, propertyKey: string|symbol): void\n {\n const trgt = target as ModelDecoratorMetadata<TModel>;\n\n if(!trgt.ɵControlsMetadata)\n {\n Object.defineProperty(trgt, nameof<ModelDecoratorMetadata>('ɵControlsMetadata'),\n {\n value: {},\n writable: false,\n enumerable: false,\n configurable: false\n });\n }\n\n //keep current validators\n const originValidators = trgt.ɵControlsMetadata[propertyKey as keyof TModel]?.validators ?? [];\n const originAsyncValidators = trgt.ɵControlsMetadata[propertyKey as keyof TModel]?.asyncValidators ?? [];\n\n //merge all other values\n trgt.ɵControlsMetadata[propertyKey as keyof TModel] = \n {\n ...ɵDefaultPropertyMetadata,\n ...trgt.ɵControlsMetadata[propertyKey as keyof TModel],\n ...metadata\n };\n\n //merge validators\n const propertyMetadata = trgt.ɵControlsMetadata[propertyKey as keyof TModel];\n\n propertyMetadata.validators =\n [\n ...originValidators,\n ...propertyMetadata.validators,\n ];\n\n propertyMetadata.asyncValidators =\n [\n ...originAsyncValidators,\n ...propertyMetadata.asyncValidators,\n ];\n };\n}"]}
|
|
@@ -21,8 +21,8 @@ export function ModelPropertyMetadata(metadata) {
|
|
|
21
21
|
//merge all other values
|
|
22
22
|
trgt.ɵControlsMetadata[propertyKey] =
|
|
23
23
|
{
|
|
24
|
-
...trgt.ɵControlsMetadata[propertyKey],
|
|
25
24
|
...ɵDefaultPropertyMetadata,
|
|
25
|
+
...trgt.ɵControlsMetadata[propertyKey],
|
|
26
26
|
...metadata
|
|
27
27
|
};
|
|
28
28
|
//merge validators
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelPropertyMetadata.decorator.js","sourceRoot":"","sources":["../../../../../../forms/src/misc/formModel/decorators/modelPropertyMetadata.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAIlD,OAAO,EAAC,wBAAwB,EAAC,MAAM,kBAAkB,CAAC;AAE1D;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CACe,QAA+C;IAE/F,OAAO,UAAS,MAAc,EAAE,WAA0B;QAEtD,MAAM,IAAI,GAAG,MAAwC,CAAC;QAEtD,IAAG,CAAC,IAAI,CAAC,iBAAiB,EAC1B;YACI,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAyB,mBAAmB,CAAC,EAC/E;gBACI,KAAK,EAAE,EAAE;gBACT,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,KAAK;gBACjB,YAAY,EAAE,KAAK;aACtB,CAAC,CAAC;SACN;QAED,yBAAyB;QACzB,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC,EAAE,UAAU,IAAI,EAAE,CAAC;QAC/F,MAAM,qBAAqB,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC,EAAE,eAAe,IAAI,EAAE,CAAC;QAEzG,wBAAwB;QACxB,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC;YACnD;gBACI,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC;gBACtD,GAAG,
|
|
1
|
+
{"version":3,"file":"modelPropertyMetadata.decorator.js","sourceRoot":"","sources":["../../../../../../forms/src/misc/formModel/decorators/modelPropertyMetadata.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAIlD,OAAO,EAAC,wBAAwB,EAAC,MAAM,kBAAkB,CAAC;AAE1D;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CACe,QAA+C;IAE/F,OAAO,UAAS,MAAc,EAAE,WAA0B;QAEtD,MAAM,IAAI,GAAG,MAAwC,CAAC;QAEtD,IAAG,CAAC,IAAI,CAAC,iBAAiB,EAC1B;YACI,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAyB,mBAAmB,CAAC,EAC/E;gBACI,KAAK,EAAE,EAAE;gBACT,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,KAAK;gBACjB,YAAY,EAAE,KAAK;aACtB,CAAC,CAAC;SACN;QAED,yBAAyB;QACzB,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC,EAAE,UAAU,IAAI,EAAE,CAAC;QAC/F,MAAM,qBAAqB,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC,EAAE,eAAe,IAAI,EAAE,CAAC;QAEzG,wBAAwB;QACxB,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC;YACnD;gBACI,GAAG,wBAAwB;gBAC3B,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC;gBACtD,GAAG,QAAQ;aACd,CAAC;QAEF,kBAAkB;QAClB,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAA2B,CAAC,CAAC;QAE7E,gBAAgB,CAAC,UAAU;YAC3B;gBACI,GAAG,gBAAgB;gBACnB,GAAG,gBAAgB,CAAC,UAAU;aACjC,CAAC;QAEF,gBAAgB,CAAC,eAAe;YAChC;gBACI,GAAG,qBAAqB;gBACxB,GAAG,gBAAgB,CAAC,eAAe;aACtC,CAAC;IACN,CAAC,CAAC;AACN,CAAC","sourcesContent":["import {Dictionary, nameof} from '@jscrpt/common';\n\nimport {ModelDecoratorMetadata} from '../interfaces/modelDecoratorMetadata';\nimport {ModelPropertyDecoratorMetadata} from '../interfaces/modelPropertyDecoratorMetadata';\nimport {ɵDefaultPropertyMetadata} from '../misc/defaults';\n\n/**\n * Defines metadata for model property\n * @param metadata - Metadata for model property, used for creating form\n */\nexport function ModelPropertyMetadata<TArgs extends Dictionary<any> = any,\n TModel = any>(metadata: ModelPropertyDecoratorMetadata<TArgs>): PropertyDecorator\n{\n return function(target: Object, propertyKey: string|symbol): void\n {\n const trgt = target as ModelDecoratorMetadata<TModel>;\n\n if(!trgt.ɵControlsMetadata)\n {\n Object.defineProperty(trgt, nameof<ModelDecoratorMetadata>('ɵControlsMetadata'),\n {\n value: {},\n writable: false,\n enumerable: false,\n configurable: false\n });\n }\n\n //keep current validators\n const originValidators = trgt.ɵControlsMetadata[propertyKey as keyof TModel]?.validators ?? [];\n const originAsyncValidators = trgt.ɵControlsMetadata[propertyKey as keyof TModel]?.asyncValidators ?? [];\n\n //merge all other values\n trgt.ɵControlsMetadata[propertyKey as keyof TModel] = \n {\n ...ɵDefaultPropertyMetadata,\n ...trgt.ɵControlsMetadata[propertyKey as keyof TModel],\n ...metadata\n };\n\n //merge validators\n const propertyMetadata = trgt.ɵControlsMetadata[propertyKey as keyof TModel];\n\n propertyMetadata.validators =\n [\n ...originValidators,\n ...propertyMetadata.validators,\n ];\n\n propertyMetadata.asyncValidators =\n [\n ...originAsyncValidators,\n ...propertyMetadata.asyncValidators,\n ];\n };\n}"]}
|
package/package.json
CHANGED
package/version.bak
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
11.2.0-beta.
|
|
1
|
+
11.2.0-beta.20220301105854
|