@nu-art/ts-common 0.100.2 → 0.100.5

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nu-art/ts-common",
3
- "version": "0.100.2",
3
+ "version": "0.100.5",
4
4
  "description": "js and ts infra",
5
5
  "keywords": [
6
6
  "TacB0sS",
@@ -1,6 +1,7 @@
1
1
  import { Logger } from '../core/logger/Logger';
2
2
  import { KeyValue, TS_Object } from '../utils/types';
3
3
  export declare class Replacer extends Logger {
4
+ private strictMode;
4
5
  private static RuntimeParam;
5
6
  private static Indicator_RuntimeParam;
6
7
  private static Regexp_paramGroup;
@@ -9,12 +10,15 @@ export declare class Replacer extends Logger {
9
10
  private static Regexp_forLoopParam;
10
11
  private input;
11
12
  private aliases;
13
+ private fallbackReplacer?;
12
14
  constructor();
15
+ setFallbackReplacer(fallbackReplacer?: Replacer): this;
16
+ setNotStrict(): this;
13
17
  getInput(): TS_Object;
14
18
  setInput(input: TS_Object, aliases?: KeyValue[]): this;
15
19
  replace(_content?: string, runtime?: TS_Object): string;
16
20
  private replaceParams;
17
- private replaceParam;
21
+ private resolveParam;
18
22
  private replaceLoops;
19
23
  private resolveParamValue;
20
24
  }
package/tools/Replacer.js CHANGED
@@ -40,11 +40,20 @@ var Replacer = /** @class */ (function (_super) {
40
40
  __extends(Replacer, _super);
41
41
  function Replacer() {
42
42
  var _this = _super.call(this) || this;
43
+ _this.strictMode = true;
43
44
  _this.input = {};
44
45
  _this.aliases = [];
45
46
  return _this;
46
47
  // this.setMinLevel(LogLevel.Error);
47
48
  }
49
+ Replacer.prototype.setFallbackReplacer = function (fallbackReplacer) {
50
+ this.fallbackReplacer = fallbackReplacer;
51
+ return this;
52
+ };
53
+ Replacer.prototype.setNotStrict = function () {
54
+ this.strictMode = false;
55
+ return this;
56
+ };
48
57
  Replacer.prototype.getInput = function () {
49
58
  return this.input;
50
59
  };
@@ -71,12 +80,15 @@ var Replacer = /** @class */ (function (_super) {
71
80
  var param = (_a = match.match(Replacer.Regexp_param)) === null || _a === void 0 ? void 0 : _a[1];
72
81
  if (param === undefined)
73
82
  return toRet;
74
- return _this.replaceParam(param, toRet, runtime);
83
+ var value = _this.resolveParam(param, toRet, runtime);
84
+ return toRet.replace(new RegExp("\\$\\{".concat((0, string_tools_1.escape_RegExp)(param), "\\}"), 'g'), value);
75
85
  }, content)) || content;
76
86
  };
77
- Replacer.prototype.replaceParam = function (param, toRet, runtime) {
87
+ Replacer.prototype.resolveParam = function (param, toRet, runtime) {
78
88
  var value = this.resolveParamValue(param, runtime);
79
- return toRet.replace(new RegExp("\\$\\{".concat((0, string_tools_1.escape_RegExp)(param), "\\}"), 'g'), value);
89
+ if (this.fallbackReplacer && (value === undefined || value === ''))
90
+ return this.fallbackReplacer.resolveParam(param, toRet, runtime);
91
+ return value;
80
92
  };
81
93
  Replacer.prototype.replaceLoops = function (content, runtime) {
82
94
  var _this = this;
@@ -139,7 +151,8 @@ var Replacer = /** @class */ (function (_super) {
139
151
  }
140
152
  if (value === undefined) {
141
153
  this.logWarning('input', this.input);
142
- throw new validator_1.ValidationException("Cannot resolve runtime variable for parts ".concat(param), param, this.input);
154
+ if (this.strictMode)
155
+ throw new validator_1.ValidationException("Cannot resolve runtime variable for parts ".concat(param), param, this.input);
143
156
  }
144
157
  return value;
145
158
  // this.logDebug(`Input:`, this.input);
@@ -148,8 +161,8 @@ var Replacer = /** @class */ (function (_super) {
148
161
  };
149
162
  Replacer.RuntimeParam = '__runtime';
150
163
  Replacer.Indicator_RuntimeParam = '__';
151
- Replacer.Regexp_paramGroup = /\$\{(.*?)\}/g;
152
- Replacer.Regexp_param = /\$\{(.*?)\}/;
164
+ Replacer.Regexp_paramGroup = /\$\{(\{?.*?\}?)\}/g;
165
+ Replacer.Regexp_param = /\$\{(\{?.*?\}?)\}/;
153
166
  Replacer.Regexp_forLoopGroupStart = /\{\{foreach (.*?) in (.*?)\}\}/g;
154
167
  Replacer.Regexp_forLoopParam = /\{\{foreach (.*?) in (.*?)\}\}/;
155
168
  return Replacer;
@@ -1 +1 @@
1
- {"version":3,"file":"Replacer.js","sourceRoot":"","sources":["../../src/main/tools/Replacer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Replacer.js","sourceRoot":"","sources":["../../src/main/tools/Replacer.ts"],"names":[],"mappings":"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"}
@@ -14,7 +14,6 @@ export declare function arrayToMap<T>(array: T[], getKey: (item: T, index: numbe
14
14
  }): {
15
15
  [k: string]: T;
16
16
  };
17
- export declare function _sortArray<T>(array: T[], map?: (item: T) => any, invert?: boolean): T[];
18
17
  export declare function sortArray<T>(array: T[], map?: (item: T) => any, invert?: boolean): T[];
19
18
  export declare function batchAction<T extends any = any, R extends any = any>(arr: T[], chunk: number, action: (elements: T[]) => Promise<R | R[]>): Promise<R[]>;
20
19
  export declare function batchActionParallel<T extends any = any, R extends any = any>(arr: T[], chunk: number, action: (elements: T[]) => Promise<R | R[]>): Promise<R[]>;
@@ -53,7 +53,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
53
53
  }
54
54
  };
55
55
  Object.defineProperty(exports, "__esModule", { value: true });
56
- exports.flatArray = exports.batchActionParallel = exports.batchAction = exports.sortArray = exports._sortArray = exports.arrayToMap = exports.filterInstances = exports.filterDuplicates = exports.findDuplicates = exports.filterAsync = exports.toggleElementInArray = exports.addItemToArrayAtIndex = exports.addItemToArray = exports.addAllItemToArray = exports.removeFromArrayByIndex = exports.removeFromArray = exports.removeItemFromArray = void 0;
56
+ exports.flatArray = exports.batchActionParallel = exports.batchAction = exports.sortArray = exports.arrayToMap = exports.filterInstances = exports.filterDuplicates = exports.findDuplicates = exports.filterAsync = exports.toggleElementInArray = exports.addItemToArrayAtIndex = exports.addItemToArray = exports.addAllItemToArray = exports.removeFromArrayByIndex = exports.removeFromArray = exports.removeItemFromArray = void 0;
57
57
  function removeItemFromArray(array, item) {
58
58
  var index = array.indexOf(item);
59
59
  return removeFromArrayByIndex(array, index);
@@ -127,27 +127,13 @@ function arrayToMap(array, getKey, map) {
127
127
  }, map || {});
128
128
  }
129
129
  exports.arrayToMap = arrayToMap;
130
- // updateProperty<T extends TS_Object>(map: { [k: string]: T }, getKey: (element: T) => string, elements: T[]) {
131
- // }
132
- function _sortArray(array, map, invert) {
133
- if (map === void 0) { map = function (i) { return i; }; }
134
- if (invert === void 0) { invert = false; }
135
- var compareFn = function (a, b) {
136
- var _a = map(a);
137
- var _b = map(b);
138
- return (_a < _b ? -1 : (_a === _b ? 0 : 1)) * (invert ? -1 : 1);
139
- };
140
- return array.sort(compareFn);
141
- }
142
- exports._sortArray = _sortArray;
143
130
  function sortArray(array, map, invert) {
144
131
  if (map === void 0) { map = function (i) { return i; }; }
145
132
  if (invert === void 0) { invert = false; }
146
- console.log('sortArray is deprecated and inverted... please use _sortArray');
147
133
  var compareFn = function (a, b) {
148
134
  var _a = map(a);
149
135
  var _b = map(b);
150
- return (_a > _b ? -1 : (_a === _b ? 0 : 1)) * (invert ? -1 : 1);
136
+ return (_a < _b ? -1 : (_a === _b ? 0 : 1)) * (invert ? -1 : 1);
151
137
  };
152
138
  return array.sort(compareFn);
153
139
  }
@@ -1 +1 @@
1
- {"version":3,"file":"array-tools.js","sourceRoot":"","sources":["../../src/main/utils/array-tools.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"array-tools.js","sourceRoot":"","sources":["../../src/main/utils/array-tools.ts"],"names":[],"mappings":"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"}
@@ -16,6 +16,7 @@ export declare const tsValidateObjectValues: <V, T = {
16
16
  [k: string]: V;
17
17
  }>(validator: ValidatorTypeResolver<V>, mandatory?: boolean) => Validator<T>;
18
18
  export declare const tsValidateArray: <T extends any[], I = ArrayType<T>>(validator: ValidatorTypeResolver<I>, mandatory?: boolean) => Validator<I[]>;
19
+ export declare const tsValidateString: (length?: number, mandatory?: boolean) => Validator<string>;
19
20
  export declare const tsValidateMD5: (mandatory?: boolean) => Validator<string>;
20
21
  export declare const tsValidateRegexp: (regexp: RegExp, mandatory?: boolean) => Validator<string>;
21
22
  export declare const tsValidateNumber: (mandatory?: boolean) => Validator<number>;
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
32
32
  };
33
33
  })();
34
34
  Object.defineProperty(exports, "__esModule", { value: true });
35
- exports.tsValidateAudit = exports.tsValidateTimestamp = exports.tsValidateObject = exports.tsValidate = exports.tsValidateRange = exports.tsValidateValue = exports.tsValidateBoolean = exports.tsValidateNumber = exports.tsValidateRegexp = exports.tsValidateMD5 = exports.tsValidateArray = exports.tsValidateObjectValues = exports.tsValidateExists = exports.assertValidateMandatoryProperty = exports.ValidationException = void 0;
35
+ exports.tsValidateAudit = exports.tsValidateTimestamp = exports.tsValidateObject = exports.tsValidate = exports.tsValidateRange = exports.tsValidateValue = exports.tsValidateBoolean = exports.tsValidateNumber = exports.tsValidateRegexp = exports.tsValidateMD5 = exports.tsValidateString = exports.tsValidateArray = exports.tsValidateObjectValues = exports.tsValidateExists = exports.assertValidateMandatoryProperty = exports.ValidationException = void 0;
36
36
  var exceptions_1 = require("../core/exceptions");
37
37
  var tools_1 = require("../utils/tools");
38
38
  var object_tools_1 = require("../utils/object-tools");
@@ -95,6 +95,24 @@ var tsValidateArray = function (validator, mandatory) {
95
95
  };
96
96
  };
97
97
  exports.tsValidateArray = tsValidateArray;
98
+ var tsValidateString = function (length, mandatory) {
99
+ if (length === void 0) { length = -1; }
100
+ if (mandatory === void 0) { mandatory = true; }
101
+ return function (path, input) {
102
+ (0, exports.assertValidateMandatoryProperty)(mandatory, path, input);
103
+ if (!input)
104
+ return;
105
+ // noinspection SuspiciousTypeOfGuard
106
+ if (typeof input !== 'string')
107
+ throw new ValidationException("input is not a string", path, input);
108
+ if (length === -1)
109
+ return;
110
+ if (input.length <= length)
111
+ return;
112
+ throw new ValidationException("input is longer than ".concat(length), path, input);
113
+ };
114
+ };
115
+ exports.tsValidateString = tsValidateString;
98
116
  var tsValidateMD5 = function (mandatory) {
99
117
  if (mandatory === void 0) { mandatory = true; }
100
118
  return (0, exports.tsValidateRegexp)(/[a-zA-Z\d]{32}/, mandatory);
@@ -1 +1 @@
1
- {"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/main/validator/validator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/main/validator/validator.ts"],"names":[],"mappings":"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"}