@nu-art/ts-common 0.33.38 → 0.33.42

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.
Files changed (20) hide show
  1. package/core/module-manager.d.ts +2 -2
  2. package/core/module-manager.js +2 -2
  3. package/core/module-manager.js.map +1 -1
  4. package/index.d.ts +5 -4
  5. package/index.js +1 -0
  6. package/index.js.map +1 -1
  7. package/modules/CSVModule.js +4 -4
  8. package/modules/CSVModule.js.map +1 -1
  9. package/package.json +1 -1
  10. package/tools/Replacer.d.ts +19 -0
  11. package/tools/Replacer.js +152 -0
  12. package/tools/Replacer.js.map +1 -0
  13. package/utils/array-tools.d.ts +3 -2
  14. package/utils/array-tools.js +8 -2
  15. package/utils/array-tools.js.map +1 -1
  16. package/utils/date-time-tools.d.ts +1 -1
  17. package/utils/date-time-tools.js +4 -5
  18. package/utils/date-time-tools.js.map +1 -1
  19. package/utils/types.d.ts +6 -0
  20. package/utils/types.js.map +1 -1
package/core/module-manager.d.ts CHANGED
@@ -1,8 +1,8 @@
1
1
  /**
2
2
  * Created by tacb0ss on 08/07/2018.
3
3
  */
4
- import { Module } from "./module";
5
- import { Logger } from "./logger/Logger";
4
+ import { Module } from './module';
5
+ import { Logger } from './logger/Logger';
6
6
  export declare function moduleResolver(): Module<any>[];
7
7
  export declare class ModuleManager extends Logger {
8
8
  protected config: any;
package/core/module-manager.js CHANGED
@@ -49,7 +49,7 @@ var ModuleManager = /** @class */ (function (_super) {
49
49
  var _this = _super.call(this) || this;
50
50
  _this.modules = _modules;
51
51
  if (ModuleManager.instance)
52
- throw new exceptions_1.BadImplementationException("Already have one instance of ModuleManager");
52
+ throw new exceptions_1.BadImplementationException('Already have one instance of ModuleManager');
53
53
  ModuleManager.instance = _this;
54
54
  dispatcher_1.Dispatcher.modulesResolver = moduleResolver;
55
55
  return _this;
@@ -92,7 +92,7 @@ var ModuleManager = /** @class */ (function (_super) {
92
92
  module.setConfig(_this.config[module.getName()]);
93
93
  });
94
94
  this.modules.forEach(function (module) {
95
- _this.logInfo("--------- ".concat(module.getName(), " ---------"));
95
+ _this.logDebug("--------- ".concat(module.getName(), " ---------"));
96
96
  // @ts-ignore
97
97
  module.init();
98
98
  // @ts-ignore
package/core/module-manager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"module-manager.js","sourceRoot":"","sources":["../../src/main/core/module-manager.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;;;;;;;AAMH,2CAAwC;AACxC,2CAAwD;AACxD,0CAAuC;AACvC,oDAG8B;AAE9B,IAAM,QAAQ,GAAa,EAAE,CAAC;AAE9B,SAAgB,cAAc;IAC7B,OAAO,QAAQ,CAAC;AACjB,CAAC;AAFD,wCAEC;AAED;IACS,iCAAM;IAMd,oCAAoC;IACpC;QAAA,YACC,iBAAO,SAMP;QAXS,aAAO,GAAa,QAAQ,CAAC;QAMtC,IAAI,aAAa,CAAC,QAAQ;YACzB,MAAM,IAAI,uCAA0B,CAAC,4CAA4C,CAAC,CAAC;QAEpF,aAAa,CAAC,QAAQ,GAAG,KAAI,CAAC;QAC9B,uBAAU,CAAC,eAAe,GAAG,cAAc,CAAC;;IAC7C,CAAC;IAED,qCAAa,GAAb,UAAiB,MAAgC;QAChD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAmB,CAAC;IACtD,CAAC;IAEM,iCAAS,GAAhB,UAAiB,MAAc;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,kCAAU,GAAjB;QAAkB,iBAAoB;aAApB,UAAoB,EAApB,qBAAoB,EAApB,IAAoB;YAApB,4BAAoB;;QACrC,OAAO,CAAC,MAAM,CAAC,UAAC,KAAe,EAAE,MAAc;YAC9C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC1B,IAAA,4BAAc,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAE/B,OAAO,KAAK,CAAA;QACb,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACjB,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,kCAAU,GAAjB;QAAkB,iBAAoB;aAApB,UAAoB,EAApB,qBAAoB,EAApB,IAAoB;YAApB,4BAAoB;;QACrC,IAAI,CAAC,OAAO,GAAG,IAAA,8BAAgB,EAAC,OAAO,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,4BAAI,GAAX;QAAA,iBAwBC;QAvBA,IAAI,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAC,MAAc;YACnC,aAAa;YACb,MAAM,CAAC,UAAU,CAAC,KAAI,CAAC,CAAC;YAExB,IAAI,KAAI,CAAC,MAAM;gBACf,aAAa;gBACZ,MAAM,CAAC,SAAS,CAAC,KAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAA,MAAM;YAC1B,KAAI,CAAC,OAAO,CAAC,qBAAc,MAAM,CAAC,OAAO,EAAE,gBAAa,CAAC,CAAC;YAC1D,aAAa;YACb,MAAM,CAAC,IAAI,EAAE,CAAC;YACd,aAAa;YACb,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,aAAa;QACb,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,QAAQ,EAAE,EAAjB,CAAiB,CAAC,CAAC;QAElD,IAAI,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,6BAAK,GAAL;QACC,IAAI,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;IACF,oBAAC;AAAD,CAAC,AAtED,CACS,eAAM,GAqEd;AAtEY,sCAAa"}
1
+ {"version":3,"file":"module-manager.js","sourceRoot":"","sources":["../../src/main/core/module-manager.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;;;;;;;AAMH,2CAAwC;AACxC,2CAAwD;AACxD,0CAAuC;AACvC,oDAAsE;AAEtE,IAAM,QAAQ,GAAa,EAAE,CAAC;AAE9B,SAAgB,cAAc;IAC7B,OAAO,QAAQ,CAAC;AACjB,CAAC;AAFD,wCAEC;AAED;IACS,iCAAM;IAMd,oCAAoC;IACpC;QAAA,YACC,iBAAO,SAMP;QAXS,aAAO,GAAa,QAAQ,CAAC;QAMtC,IAAI,aAAa,CAAC,QAAQ;YACzB,MAAM,IAAI,uCAA0B,CAAC,4CAA4C,CAAC,CAAC;QAEpF,aAAa,CAAC,QAAQ,GAAG,KAAI,CAAC;QAC9B,uBAAU,CAAC,eAAe,GAAG,cAAc,CAAC;;IAC7C,CAAC;IAED,qCAAa,GAAb,UAAiB,MAAgC;QAChD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAmB,CAAC;IACtD,CAAC;IAEM,iCAAS,GAAhB,UAAiB,MAAc;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,kCAAU,GAAjB;QAAkB,iBAAoB;aAApB,UAAoB,EAApB,qBAAoB,EAApB,IAAoB;YAApB,4BAAoB;;QACrC,OAAO,CAAC,MAAM,CAAC,UAAC,KAAe,EAAE,MAAc;YAC9C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC1B,IAAA,4BAAc,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAE/B,OAAO,KAAK,CAAC;QACd,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACjB,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,kCAAU,GAAjB;QAAkB,iBAAoB;aAApB,UAAoB,EAApB,qBAAoB,EAApB,IAAoB;YAApB,4BAAoB;;QACrC,IAAI,CAAC,OAAO,GAAG,IAAA,8BAAgB,EAAC,OAAO,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,4BAAI,GAAX;QAAA,iBAwBC;QAvBA,IAAI,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAC,MAAc;YACnC,aAAa;YACb,MAAM,CAAC,UAAU,CAAC,KAAI,CAAC,CAAC;YAExB,IAAI,KAAI,CAAC,MAAM;gBACd,aAAa;gBACb,MAAM,CAAC,SAAS,CAAC,KAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAA,MAAM;YAC1B,KAAI,CAAC,QAAQ,CAAC,qBAAc,MAAM,CAAC,OAAO,EAAE,gBAAa,CAAC,CAAC;YAC3D,aAAa;YACb,MAAM,CAAC,IAAI,EAAE,CAAC;YACd,aAAa;YACb,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,aAAa;QACb,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,QAAQ,EAAE,EAAjB,CAAiB,CAAC,CAAC;QAElD,IAAI,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,6BAAK,GAAL;QACC,IAAI,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;IACF,oBAAC;AAAD,CAAC,AAtED,CACS,eAAM,GAqEd;AAtEY,sCAAa"}
package/index.d.ts CHANGED
@@ -16,7 +16,8 @@ export * from './core/logger/BeLogged';
16
16
  export * from './core/logger/Logger';
17
17
  export * from './core/logger/types';
18
18
  export * from './core/logger/LogClient';
19
- export * from "./permissions/permission-group";
19
+ export * from './permissions/permission-group';
20
+ export * from './tools/Replacer';
20
21
  export * from './utils/queue';
21
22
  export * from './utils/types';
22
23
  export * from './utils/crypto-tools';
@@ -28,11 +29,11 @@ export * from './utils/string-tools';
28
29
  export * from './utils/date-time-tools';
29
30
  export * from './utils/array-tools';
30
31
  export * from './utils/object-tools';
31
- export * from "./utils/merge-tools";
32
- export * from "./utils/version-tools";
32
+ export * from './utils/merge-tools';
33
+ export * from './utils/version-tools';
33
34
  export * from './utils/tools';
34
35
  export * from './utils/hash-tools';
35
36
  export * from './utils/filter-tools';
36
- export * from "./validator/validator";
37
+ export * from './validator/validator';
37
38
  export * from './consts/consts';
38
39
  export * from './modules/CliParamsModule';
package/index.js CHANGED
@@ -46,6 +46,7 @@ __exportStar(require("./core/logger/Logger"), exports);
46
46
  __exportStar(require("./core/logger/types"), exports);
47
47
  __exportStar(require("./core/logger/LogClient"), exports);
48
48
  __exportStar(require("./permissions/permission-group"), exports);
49
+ __exportStar(require("./tools/Replacer"), exports);
49
50
  __exportStar(require("./utils/queue"), exports);
50
51
  __exportStar(require("./utils/types"), exports);
51
52
  __exportStar(require("./utils/crypto-tools"), exports);
package/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/main/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH,uDAAqC;AAErC,gDAA8B;AAC9B,wDAAsC;AACtC,qDAAmC;AACnC,oDAAkC;AAClC,oDAAkC;AAClC,wDAAsC;AAEtC,qDAAmC;AACnC,sDAAoC;AACpC,qEAAmD;AACnD,mEAAiD;AACjD,oEAAkD;AAClD,kEAAgD;AAChD,mEAAiD;AACjD,yDAAuC;AACvC,uDAAqC;AACrC,sDAAoC;AACpC,0DAAwC;AAExC,iEAA+C;AAE/C,gDAA8B;AAC9B,gDAA8B;AAC9B,uDAAqC;AACrC,uDAAqC;AACrC,iEAA+C;AAC/C,yDAAuC;AACvC,uDAAqC;AACrC,uDAAqC;AACrC,0DAAwC;AACxC,sDAAoC;AACpC,uDAAqC;AACrC,sDAAoC;AACpC,wDAAsC;AACtC,gDAA8B;AAC9B,qDAAmC;AACnC,uDAAqC;AAErC,wDAAsC;AAEtC,kDAAgC;AAEhC,4DAA0C"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/main/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH,uDAAqC;AAErC,gDAA8B;AAC9B,wDAAsC;AACtC,qDAAmC;AACnC,oDAAkC;AAClC,oDAAkC;AAClC,wDAAsC;AAEtC,qDAAmC;AACnC,sDAAoC;AACpC,qEAAmD;AACnD,mEAAiD;AACjD,oEAAkD;AAClD,kEAAgD;AAChD,mEAAiD;AACjD,yDAAuC;AACvC,uDAAqC;AACrC,sDAAoC;AACpC,0DAAwC;AAExC,iEAA+C;AAE/C,mDAAiC;AAEjC,gDAA8B;AAC9B,gDAA8B;AAC9B,uDAAqC;AACrC,uDAAqC;AACrC,iEAA+C;AAC/C,yDAAuC;AACvC,uDAAqC;AACrC,uDAAqC;AACrC,0DAAwC;AACxC,sDAAoC;AACpC,uDAAqC;AACrC,sDAAoC;AACpC,wDAAsC;AACtC,gDAA8B;AAC9B,qDAAmC;AACnC,uDAAqC;AAErC,wDAAsC;AAEtC,kDAAgC;AAEhC,4DAA0C"}
package/modules/CSVModule.js CHANGED
@@ -95,7 +95,7 @@ var CSVModule_Class = /** @class */ (function (_super) {
95
95
  var csv;
96
96
  return __generator(this, function (_a) {
97
97
  csv = this.csvExporter.generateCsv(items, true);
98
- return [2 /*return*/, fs_1.promises.writeFile(outputFile, csv, { encoding: "utf8" })];
98
+ return [2 /*return*/, fs_1.promises.writeFile(outputFile, csv, { encoding: 'utf8' })];
99
99
  });
100
100
  });
101
101
  };
@@ -103,7 +103,7 @@ var CSVModule_Class = /** @class */ (function (_super) {
103
103
  return __awaiter(this, void 0, void 0, function () {
104
104
  var stream;
105
105
  return __generator(this, function (_a) {
106
- stream = (0, fs_1.createReadStream)(inputFile, { encoding: "utf8" });
106
+ stream = (0, fs_1.createReadStream)(inputFile, { encoding: 'utf8' });
107
107
  return [2 /*return*/, this.readCsvFromStream(stream, columnsToProps)];
108
108
  });
109
109
  });
@@ -112,7 +112,7 @@ var CSVModule_Class = /** @class */ (function (_super) {
112
112
  return __awaiter(this, void 0, void 0, function () {
113
113
  var stream;
114
114
  return __generator(this, function (_a) {
115
- stream = stream_1.Readable.from(buffer.toString("utf-8"), { encoding: "utf8" });
115
+ stream = stream_1.Readable.from(buffer.toString('utf-8'), { encoding: 'utf8' });
116
116
  return [2 /*return*/, this.readCsvFromStream(stream, columnsToProps)];
117
117
  });
118
118
  });
@@ -126,7 +126,7 @@ var CSVModule_Class = /** @class */ (function (_super) {
126
126
  stream
127
127
  .pipe(csvParser(_this.createReadParserOptions(columnsToProps)))
128
128
  .on('data', function (instance) {
129
- delete instance["undefined"];
129
+ delete instance['undefined'];
130
130
  results.push(instance);
131
131
  })
132
132
  .on('error', function (err) { return reject(err); })
package/modules/CSVModule.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CSVModule.js","sourceRoot":"","sources":["../../src/main/modules/CSVModule.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,+CAAmD;AACnD,yBAAoD;AAEpD,yCAAsC;AACtC,iCAAgC;AAChC,4CAA+C;AAO/C,IAAM,aAAa,GAAG;IACrB,OAAO,EAAE;QACR,cAAc,EAAE,GAAG;QACnB,YAAY,EAAE,GAAG;QACjB,gBAAgB,EAAE,GAAG;QACrB,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,IAAI;QACf,KAAK,EAAE,iBAAiB;QACxB,WAAW,EAAE,KAAK;QAClB,MAAM,EAAE,IAAI;QACZ,gBAAgB,EAAE,IAAI;KACtB;CACD,CAAC;AASF;IACS,mCAAc;IAItB;QAAA,YACC,iBAAO,SAGP;QADA,KAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;;IACtC,CAAC;IAES,8BAAI,GAAd;QACC,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACxE,CAAC;IAEM,8BAAc,GAArB,UAAsB,OAAgB;QACrC,OAAO,IAAI,2BAAW,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,gCAAM,GAAN,UAAU,KAAU,EAAE,SAAgB;QAAhB,0BAAA,EAAA,gBAAgB;QACrC,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACvD,CAAC;IAEK,oCAAU,GAAhB,UAAoB,UAAkB,EAAE,KAAU,EAAE,cAAiC;;;;gBAC9E,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBACtD,sBAAO,aAAE,CAAC,SAAS,CAAC,UAAU,EAAE,GAAG,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,EAAC;;;KACzD;IAEK,yCAAe,GAArB,UAAoD,SAAiB,EAAE,cAAgC;;;;gBAChG,MAAM,GAAG,IAAA,qBAAgB,EAAC,SAAS,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAC;gBAC/D,sBAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,cAAc,CAAC,EAAC;;;KACtD;IAEK,2CAAiB,GAAvB,UAAsD,MAAc,EAAE,cAAgC;;;;gBAC/F,MAAM,GAAa,iBAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAC;gBACrF,sBAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,cAAc,CAAC,EAAC;;;KACtD;IAEK,2CAAiB,GAAvB,UAAsD,MAAgB,EAAE,cAAgC;;;;gBACvG,sBAAO,IAAI,OAAO,CAAM,UAAC,OAAO,EAAE,MAAM;wBACvC,IAAM,OAAO,GAAQ,EAAE,CAAC;wBAExB,MAAM;6BACJ,IAAI,CAAC,SAAS,CAAC,KAAI,CAAC,uBAAuB,CAAC,cAAc,CAAC,CAAC,CAAC;6BAC7D,EAAE,CAAC,MAAM,EAAE,UAAC,QAAQ;4BACpB,OAAO,QAAQ,CAAC,WAAW,CAAC,CAAA;4BAC5B,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;wBACxB,CAAC,CAAC;6BACD,EAAE,CAAC,OAAO,EAAE,UAAC,GAAG,IAAK,OAAA,MAAM,CAAC,GAAG,CAAC,EAAX,CAAW,CAAC;6BACjC,EAAE,CAAC,KAAK,EAAE,cAAM,OAAA,OAAO,CAAC,OAAO,CAAC,EAAhB,CAAgB,CAAC,CAAC;oBACrC,CAAC,CAAC,EAAA;;;KACF;IAEO,iDAAuB,GAA/B,UAAmC,cAAgC;QAClE,OAAO;YACN,UAAU,EAAE,UAAC,IAAwB;gBACpC,OAAO,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAG,IAAI,CAAC,MAAM,CAAW,KAAI,IAAI,CAAC,MAAM,CAAC;YAC/D,CAAC;SACD,CAAC;IACH,CAAC;IACF,sBAAC;AAAD,CAAC,AA5DD,CACS,eAAM,GA2Dd;AAGY,QAAA,SAAS,GAAG,IAAI,eAAe,EAAE,CAAC"}
1
+ {"version":3,"file":"CSVModule.js","sourceRoot":"","sources":["../../src/main/modules/CSVModule.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nu-art/ts-common",
3
- "version": "0.33.38",
3
+ "version": "0.33.42",
4
4
  "description": "js and ts infra",
5
5
  "keywords": [
6
6
  "TacB0sS",
package/tools/Replacer.d.ts ADDED
@@ -0,0 +1,19 @@
1
+ import { Logger } from '../core/logger/Logger';
2
+ import { KeyValue, ObjectTS } from '../utils/types';
3
+ export declare class Replacer extends Logger {
4
+ private static RuntimeParam;
5
+ private static Indicator_RuntimeParam;
6
+ private static Regexp_paramGroup;
7
+ private static Regexp_param;
8
+ private static Regexp_forLoopGroupStart;
9
+ private static Regexp_forLoopParam;
10
+ private input;
11
+ private aliases;
12
+ constructor();
13
+ setInput(input: ObjectTS, aliases?: KeyValue[]): this;
14
+ replace(_content: string, runtime?: ObjectTS): string;
15
+ private replaceParams;
16
+ private replaceParam;
17
+ private replaceLoops;
18
+ private resolveParamValue;
19
+ }
package/tools/Replacer.js ADDED
@@ -0,0 +1,152 @@
1
+ "use strict";
2
+ /*
3
+ * ts-common is the basic building blocks of our typescript projects
4
+ *
5
+ * Copyright (C) 2020 Adam van der Kruk aka TacB0sS
6
+ *
7
+ * Licensed under the Apache License, Version 2.0 (the "License");
8
+ * you may not use this file except in compliance with the License.
9
+ * You may obtain a copy of the License at
10
+ *
11
+ * http://www.apache.org/licenses/LICENSE-2.0
12
+ *
13
+ * Unless required by applicable law or agreed to in writing, software
14
+ * distributed under the License is distributed on an "AS IS" BASIS,
15
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
+ * See the License for the specific language governing permissions and
17
+ * limitations under the License.
18
+ */
19
+ var __extends = (this && this.__extends) || (function () {
20
+ var extendStatics = function (d, b) {
21
+ extendStatics = Object.setPrototypeOf ||
22
+ ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
23
+ function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
24
+ return extendStatics(d, b);
25
+ };
26
+ return function (d, b) {
27
+ if (typeof b !== "function" && b !== null)
28
+ throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
29
+ extendStatics(d, b);
30
+ function __() { this.constructor = d; }
31
+ d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
32
+ };
33
+ })();
34
+ Object.defineProperty(exports, "__esModule", { value: true });
35
+ exports.Replacer = void 0;
36
+ var Logger_1 = require("../core/logger/Logger");
37
+ var string_tools_1 = require("../utils/string-tools");
38
+ var validator_1 = require("../validator/validator");
39
+ var Replacer = /** @class */ (function (_super) {
40
+ __extends(Replacer, _super);
41
+ function Replacer() {
42
+ var _this = _super.call(this) || this;
43
+ _this.input = {};
44
+ _this.aliases = [];
45
+ return _this;
46
+ // this.setMinLevel(LogLevel.Error);
47
+ }
48
+ Replacer.prototype.setInput = function (input, aliases) {
49
+ if (aliases === void 0) { aliases = []; }
50
+ this.input = input;
51
+ this.aliases = aliases;
52
+ return this;
53
+ };
54
+ Replacer.prototype.replace = function (_content, runtime) {
55
+ var content = this.replaceLoops(_content, runtime);
56
+ content = this.replaceParams(content, runtime);
57
+ if (_content !== content)
58
+ content = this.replace(content, runtime);
59
+ return content;
60
+ };
61
+ Replacer.prototype.replaceParams = function (content, runtime) {
62
+ var _this = this;
63
+ var matches = content.match(Replacer.Regexp_paramGroup);
64
+ return (matches === null || matches === void 0 ? void 0 : matches.reduce(function (toRet, match) {
65
+ var _a;
66
+ var param = (_a = match.match(Replacer.Regexp_param)) === null || _a === void 0 ? void 0 : _a[1];
67
+ if (param === undefined)
68
+ return toRet;
69
+ return _this.replaceParam(param, toRet, runtime);
70
+ }, content)) || content;
71
+ };
72
+ Replacer.prototype.replaceParam = function (param, toRet, runtime) {
73
+ var value = this.resolveParamValue(param, runtime);
74
+ return toRet.replace(new RegExp("\\$\\{".concat((0, string_tools_1.escape_RegExp)(param), "\\}"), 'g'), value);
75
+ };
76
+ Replacer.prototype.replaceLoops = function (content, runtime) {
77
+ var _this = this;
78
+ var matches = content.match(Replacer.Regexp_forLoopGroupStart);
79
+ return (matches === null || matches === void 0 ? void 0 : matches.reduce(function (toRet, match) {
80
+ var varsMatch = match.match(Replacer.Regexp_forLoopParam);
81
+ var string = varsMatch[0];
82
+ var iterable = varsMatch[1];
83
+ var iterator = varsMatch[2];
84
+ var endMatch = "{{/foreach ".concat(iterator, "}}");
85
+ var indexOfEnd = toRet.indexOf(endMatch);
86
+ var fullOriginLoopText = toRet.substring(toRet.indexOf(string), indexOfEnd + endMatch.length);
87
+ var loopText = toRet.substring(toRet.indexOf(string) + string.length, indexOfEnd);
88
+ _this.logDebug("indexOfEnd: ".concat(endMatch, " ").concat(indexOfEnd));
89
+ _this.logDebug("string: ".concat(string, " ").concat(toRet.indexOf(string)));
90
+ _this.logDebug("iterable: ".concat(iterable));
91
+ _this.logDebug("iterator: ".concat(iterator));
92
+ _this.logDebug("loopText: ".concat(loopText));
93
+ var loopArray;
94
+ var iterableProp = "".concat(iterator);
95
+ try {
96
+ loopArray = _this.resolveParamValue(iterableProp, runtime);
97
+ }
98
+ catch (e) {
99
+ throw new validator_1.ValidationException("Error while looping on variable for parts: ", iterableProp, _this.input, e);
100
+ }
101
+ if (!Array.isArray(loopArray))
102
+ _this.logWarning("Loop object is not an array.. found:", loopArray);
103
+ var replacement = loopArray.reduce(function (_toRet, value) {
104
+ return _toRet + _this.replace(loopText, { property: value });
105
+ }, '');
106
+ var s = toRet.replace(fullOriginLoopText, replacement);
107
+ return s;
108
+ }, content)) || content;
109
+ };
110
+ Replacer.prototype.resolveParamValue = function (_param, runtime) {
111
+ var param = _param;
112
+ var alias = this.aliases.find(function (alias) { return alias.key === param; });
113
+ if (alias) {
114
+ this.logInfo('using alias: ', alias);
115
+ param = alias.value || param;
116
+ }
117
+ param = param.replace(/\[/g, '.').replace(/\]/g, '');
118
+ if (param.endsWith('.'))
119
+ param = param.substring(0, param.length - 1);
120
+ if (param.startsWith(Replacer.Indicator_RuntimeParam))
121
+ param = "".concat(Replacer.RuntimeParam, ".").concat(param.substring(Replacer.Indicator_RuntimeParam.length));
122
+ var parts = param.split('\.');
123
+ var value;
124
+ try {
125
+ if (runtime)
126
+ value = parts.reduce(function (value, key) { return value[key]; }, runtime);
127
+ if (value === undefined)
128
+ value = parts.reduce(function (value, key) { return value[key]; }, this.input);
129
+ }
130
+ catch (e) {
131
+ this.logWarning('input', this.input);
132
+ throw new validator_1.ValidationException("Error while resolving runtime variable for parts ".concat(param), param, this.input, e);
133
+ }
134
+ if (value === undefined) {
135
+ this.logWarning('input', this.input);
136
+ throw new validator_1.ValidationException("Cannot resolve runtime variable for parts ".concat(param), param, this.input);
137
+ }
138
+ return value;
139
+ // this.logDebug(`Input:`, this.input);
140
+ // this.logDebug(`Param: ${param}`, 'Parts: ', parts);
141
+ // this.logDebug(value);
142
+ };
143
+ Replacer.RuntimeParam = '__runtime';
144
+ Replacer.Indicator_RuntimeParam = '__';
145
+ Replacer.Regexp_paramGroup = /\$\{(.*?)\}/g;
146
+ Replacer.Regexp_param = /\$\{(.*?)\}/;
147
+ Replacer.Regexp_forLoopGroupStart = /\{\{foreach (.*?) in (.*?)\}\}/g;
148
+ Replacer.Regexp_forLoopParam = /\{\{foreach (.*?) in (.*?)\}\}/;
149
+ return Replacer;
150
+ }(Logger_1.Logger));
151
+ exports.Replacer = Replacer;
152
+ //# sourceMappingURL=Replacer.js.map
package/tools/Replacer.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Replacer.js","sourceRoot":"","sources":["../../src/main/tools/Replacer.ts"],"names":[],"mappings":"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"}
package/utils/array-tools.d.ts CHANGED
@@ -6,6 +6,7 @@ export declare function addItemToArray<T>(array: T[], item: T): T[];
6
6
  export declare function addItemToArrayAtIndex<T>(array: T[], item: T, index: number): T[];
7
7
  export declare function toggleElementInArray<T>(array: T[], item: T): T[];
8
8
  export declare function filterAsync<T>(arr: T[], filter: (parameter: T) => Promise<boolean>): Promise<T[]>;
9
+ export declare function findDuplicates<T>(array1: T[], array2: T[]): T[];
9
10
  export declare function filterDuplicates<T>(array: T[]): T[];
10
11
  export declare function filterInstances<T>(array: (T | undefined | null | void)[]): T[];
11
12
  export declare function arrayToMap<T>(array: T[], getKey: (item: T, index: number) => string | number, map?: {
@@ -13,8 +14,8 @@ export declare function arrayToMap<T>(array: T[], getKey: (item: T, index: numbe
13
14
  }): {
14
15
  [k: string]: T;
15
16
  };
16
- export declare function _sortArray<T>(array: T[], map: (item: T) => any, invert?: boolean): T[];
17
- export declare function sortArray<T>(array: T[], map: (item: T) => any, invert?: boolean): T[];
17
+ export declare function _sortArray<T>(array: T[], map?: (item: T) => any, invert?: boolean): T[];
18
+ export declare function sortArray<T>(array: T[], map?: (item: T) => any, invert?: boolean): T[];
18
19
  export declare function batchAction<T extends any = any, R extends any = any>(arr: T[], chunk: number, action: (elements: T[]) => Promise<R | R[]>): Promise<R[]>;
19
20
  export declare function batchActionParallel<T extends any = any, R extends any = any>(arr: T[], chunk: number, action: (elements: T[]) => Promise<R | R[]>): Promise<R[]>;
20
21
  export declare function flatArray<T>(arr: T[][] | T[], result?: T[]): T[];
package/utils/array-tools.js CHANGED
@@ -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.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._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);
@@ -108,6 +108,10 @@ function filterAsync(arr, filter) {
108
108
  });
109
109
  }
110
110
  exports.filterAsync = filterAsync;
111
+ function findDuplicates(array1, array2) {
112
+ return array1.filter(function (val) { return array2.indexOf(val) !== -1; });
113
+ }
114
+ exports.findDuplicates = findDuplicates;
111
115
  function filterDuplicates(array) {
112
116
  return Array.from(new Set(array));
113
117
  }
@@ -126,6 +130,7 @@ exports.arrayToMap = arrayToMap;
126
130
  // updateProperty<T extends ObjectTS>(map: { [k: string]: T }, getKey: (element: T) => string, elements: T[]) {
127
131
  // }
128
132
  function _sortArray(array, map, invert) {
133
+ if (map === void 0) { map = function (i) { return i; }; }
129
134
  if (invert === void 0) { invert = false; }
130
135
  var compareFn = function (a, b) {
131
136
  var _a = map(a);
@@ -136,8 +141,9 @@ function _sortArray(array, map, invert) {
136
141
  }
137
142
  exports._sortArray = _sortArray;
138
143
  function sortArray(array, map, invert) {
144
+ if (map === void 0) { map = function (i) { return i; }; }
139
145
  if (invert === void 0) { invert = false; }
140
- console.log("sortArray is deprecated and inverted... please use _sortArray");
146
+ console.log('sortArray is deprecated and inverted... please use _sortArray');
141
147
  var compareFn = function (a, b) {
142
148
  var _a = map(a);
143
149
  var _b = map(b);
package/utils/array-tools.js.map CHANGED
@@ -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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"}
package/utils/date-time-tools.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AuditBy, Timestamp } from "./types";
1
+ import { AuditBy, Timestamp } from './types';
2
2
  export declare const Second = 1000;
3
3
  export declare const Minute: number;
4
4
  export declare const Hour: number;
package/utils/date-time-tools.js CHANGED
@@ -69,8 +69,8 @@ exports.Minute = exports.Second * 60;
69
69
  exports.Hour = exports.Minute * 60;
70
70
  exports.Day = exports.Hour * 24;
71
71
  exports.Week = exports.Day * 7;
72
- exports.Format_HHmmss_DDMMYYYY = "HH:mm:ss_DD-MM-YYYY";
73
- exports.Format_YYYYMMDD_HHmmss = "YYYY-MM-DD_HH:mm:ss";
72
+ exports.Format_HHmmss_DDMMYYYY = 'HH:mm:ss_DD-MM-YYYY';
73
+ exports.Format_YYYYMMDD_HHmmss = 'YYYY-MM-DD_HH:mm:ss';
74
74
  function timeout(sleepMs) {
75
75
  return __awaiter(this, void 0, void 0, function () {
76
76
  return __generator(this, function (_a) {
@@ -150,10 +150,9 @@ exports.createReadableTimestampObject = createReadableTimestampObject;
150
150
  function formatTimestamp(pattern, timestamp, timezone) {
151
151
  if (pattern === void 0) { pattern = exports.Format_HHmmss_DDMMYYYY; }
152
152
  if (timestamp === void 0) { timestamp = currentTimeMillis(); }
153
+ if (timezone === void 0) { timezone = Intl.DateTimeFormat().resolvedOptions().timeZone; }
153
154
  var m = moment.utc(timestamp);
154
- if (timezone) {
155
- m.utcOffset(timezone);
156
- }
155
+ m.utcOffset(-new Date().getTimezoneOffset());
157
156
  return m.format(pattern);
158
157
  }
159
158
  exports.formatTimestamp = formatTimestamp;
package/utils/date-time-tools.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"date-time-tools.js","sourceRoot":"","sources":["../../src/main/utils/date-time-tools.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"date-time-tools.js","sourceRoot":"","sources":["../../src/main/utils/date-time-tools.ts"],"names":[],"mappings":"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"}
package/utils/types.d.ts CHANGED
@@ -19,6 +19,10 @@ export declare type RequireOneOptional<T extends ObjectTS, Keys extends Optional
19
19
  export declare type Constructor<T> = new (...args: any) => T;
20
20
  export declare type ArrayType<T extends any[]> = T extends (infer I)[] ? I : never;
21
21
  export declare type PartialProperties<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
22
+ export declare type KeyValue = {
23
+ key: string;
24
+ value: string;
25
+ };
22
26
  export declare type Identity = {
23
27
  id: string;
24
28
  };
@@ -34,6 +38,7 @@ export declare type TypedMap<ValueType> = {
34
38
  export declare type TypedMapValue<T extends ObjectTS, ValueType> = {
35
39
  [P in keyof T]: ValueType;
36
40
  };
41
+ export declare type AtLeast<T, K extends keyof T> = Partial<T> & Pick<T, K>;
37
42
  export declare type DB_BaseObject = {
38
43
  _id: string;
39
44
  };
@@ -41,6 +46,7 @@ export declare type DB_Object = DB_BaseObject & {
41
46
  __created: number;
42
47
  __updated: number;
43
48
  };
49
+ export declare type PreDBObject<T extends DB_Object> = PartialProperties<T, keyof DB_Object>;
44
50
  export declare type Draftable = {
45
51
  _isDraft: boolean;
46
52
  };
package/utils/types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/main/utils/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AA8DU,QAAA,IAAI,GAAG,CAAC;AACrB,CAAC,CAAC,EAAE,CAAC"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/main/utils/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AAmEU,QAAA,IAAI,GAAG,CAAC;AACrB,CAAC,CAAC,EAAE,CAAC"}