topkat-utils 1.2.47 → 1.2.49

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 CHANGED
@@ -1,3 +1,10 @@
1
+ ### v1.2.49
2
+ * FIX type in parseEnv
3
+ * revert changes because mongoId is not just any strings
4
+
5
+ ### v1.2.48
6
+ * FIX getId so that it can accept any strings
7
+
1
8
  ### v1.2.45
2
9
  * Add parent and lastElement key to informations returned by findByAddressAll
3
10
 
@@ -1,5 +1,5 @@
1
1
  /** Parse one dimention object undefined, true, false, null represented as string will be converted to primitives */
2
- export declare function parseEnv(env: any): {};
2
+ export declare function parseEnv(env: any): Record<string, string | number | boolean | null | undefined>;
3
3
  /** READ ONLY, get the environment variables (Eg. NODE_ENV) with parsed values ("true" => true, "4" => 4, "null" => null). On env variables all values are strings
4
4
  * use it like ENV().NODE_ENV
5
5
  */
@@ -1 +1 @@
1
- {"version":3,"file":"env-utils.js","sourceRoot":"","sources":["../../src/env-utils.ts"],"names":[],"mappings":";AAAA,0CAA0C;AAC1C,YAAY;AACZ,0CAA0C;;;AAE1C,oHAAoH;AACpH,SAAgB,QAAQ,CAAC,GAAG;IACxB,MAAM,MAAM,GAAG,EAAE,CAAA;IACjB,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE;QACjB,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;QAClB,IAAI,GAAG,KAAK,WAAW;YAAE,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;aACzC,IAAI,GAAG,KAAK,MAAM;YAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;aACpC,IAAI,GAAG,KAAK,OAAO;YAAE,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;aACtC,IAAI,GAAG,KAAK,MAAM;YAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;;YACpC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;KAC1B;IACD,OAAO,MAAM,CAAA;AACjB,CAAC;AAXD,4BAWC;AAED;;GAEG;AACH,SAAgB,GAAG;IACf,MAAM,QAAQ,GAAG,GAAG,EAAE,GAAG,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA,CAAC,CAAC,CAAA;IACpF,OAAO,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACpC,GAAG,EAAE,QAAQ;QACb,cAAc,EAAE,QAAQ;QACxB,cAAc,EAAE,QAAQ;KAC3B,CAAC,CAAA;AACN,CAAC;AAPD,kBAOC"}
1
+ {"version":3,"file":"env-utils.js","sourceRoot":"","sources":["../../src/env-utils.ts"],"names":[],"mappings":";AAAA,0CAA0C;AAC1C,YAAY;AACZ,0CAA0C;;;AAE1C,oHAAoH;AACpH,SAAgB,QAAQ,CAAC,GAAG;IACxB,MAAM,MAAM,GAAG,EAAkE,CAAA;IACjF,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE;QACjB,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;QAClB,IAAI,GAAG,KAAK,WAAW;YAAE,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;aACzC,IAAI,GAAG,KAAK,MAAM;YAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;aACpC,IAAI,GAAG,KAAK,OAAO;YAAE,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;aACtC,IAAI,GAAG,KAAK,MAAM;YAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;;YACpC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;KAC1B;IACD,OAAO,MAAM,CAAA;AACjB,CAAC;AAXD,4BAWC;AAED;;GAEG;AACH,SAAgB,GAAG;IACf,MAAM,QAAQ,GAAG,GAAG,EAAE,GAAG,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA,CAAC,CAAC,CAAA;IACpF,OAAO,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACpC,GAAG,EAAE,QAAQ;QACb,cAAc,EAAE,QAAQ;QACxB,cAAc,EAAE,QAAQ;KAC3B,CAAC,CAAA;AACN,CAAC;AAPD,kBAOC"}
@@ -1,5 +1,5 @@
1
1
  /** @return undefined if cannot find _id */
2
- export declare function getId(obj?: any): string | undefined;
2
+ export declare function getId(obj: any): string | undefined;
3
3
  /** Merge filter with correct handling of OR and AND
4
4
  * @param {Object} filterA
5
5
  * @param {Object} filterB
@@ -7,7 +7,7 @@ exports.mongoPush = exports.mongoFilterMerger = exports.getId = void 0;
7
7
  const validation_utils_1 = require("./validation-utils");
8
8
  const isset_1 = require("./isset");
9
9
  /** @return undefined if cannot find _id */
10
- function getId(obj = {}) {
10
+ function getId(obj) {
11
11
  if (!obj)
12
12
  return; // null case
13
13
  if (obj._id)
@@ -1 +1 @@
1
- {"version":3,"file":"mongo-utils.js","sourceRoot":"","sources":["../../src/mongo-utils.ts"],"names":[],"mappings":";;;AAAA,0CAA0C;AAC1C,cAAc;AACd,0CAA0C;AAC1C,yDAA2C;AAC3C,mCAA+B;AAE/B,2CAA2C;AAC3C,SAAgB,KAAK,CAAC,MAAW,EAAE;IAC/B,IAAI,CAAC,GAAG;QAAE,OAAM,CAAC,YAAY;IAC7B,IAAI,GAAG,CAAC,GAAG;QAAE,OAAO,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAA;SACjC,IAAI,IAAA,yBAAM,EAAC,GAAG,EAAE,UAAU,CAAC;QAAE,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAA;;QAClD,OAAM;AACf,CAAC;AALD,sBAKC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,eAAe,GAAG,KAAK;IACvE,IAAI,IAAA,aAAK,EAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAA,aAAK,EAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC5C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;QAClC,OAAO,OAAO,CAAC,IAAI,CAAA;KACtB;IACD,IAAI,IAAA,aAAK,EAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAA,aAAK,EAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC1C,IAAI,CAAC,IAAA,aAAK,EAAC,OAAO,CAAC,IAAI,CAAC;YAAE,OAAO,CAAC,IAAI,GAAG,EAAE,CAAA;QAC3C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;QAC7D,OAAO,OAAO,CAAC,GAAG,CAAA;KACrB;IACD,IAAI,eAAe,EAAE;QACjB,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC/B,OAAO,OAAO,CAAA;KACjB;;QAAM,uCAAY,OAAO,GAAK,OAAO,EAAE;AAC5C,CAAC;AAdD,8CAcC;AAED,SAAgB,SAAS,CAAC,KAAa,EAAE,KAAU,EAAE,MAA4B;IAC7E,IAAI,CAAC,IAAA,aAAK,EAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,CAAC,KAAK,GAAG,EAAE,CAAA;IAC3C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAA;AAC/B,CAAC;AAHD,8BAGC"}
1
+ {"version":3,"file":"mongo-utils.js","sourceRoot":"","sources":["../../src/mongo-utils.ts"],"names":[],"mappings":";;;AAAA,0CAA0C;AAC1C,cAAc;AACd,0CAA0C;AAC1C,yDAA2C;AAC3C,mCAA+B;AAE/B,2CAA2C;AAC3C,SAAgB,KAAK,CAAC,GAAQ;IAC1B,IAAI,CAAC,GAAG;QAAE,OAAM,CAAC,YAAY;IAC7B,IAAI,GAAG,CAAC,GAAG;QAAE,OAAO,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAA;SACjC,IAAI,IAAA,yBAAM,EAAC,GAAG,EAAE,UAAU,CAAC;QAAE,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAA;;QAClD,OAAM;AACf,CAAC;AALD,sBAKC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,eAAe,GAAG,KAAK;IACvE,IAAI,IAAA,aAAK,EAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAA,aAAK,EAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC5C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;QAClC,OAAO,OAAO,CAAC,IAAI,CAAA;KACtB;IACD,IAAI,IAAA,aAAK,EAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAA,aAAK,EAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC1C,IAAI,CAAC,IAAA,aAAK,EAAC,OAAO,CAAC,IAAI,CAAC;YAAE,OAAO,CAAC,IAAI,GAAG,EAAE,CAAA;QAC3C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;QAC7D,OAAO,OAAO,CAAC,GAAG,CAAA;KACrB;IACD,IAAI,eAAe,EAAE;QACjB,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC/B,OAAO,OAAO,CAAA;KACjB;;QAAM,uCAAY,OAAO,GAAK,OAAO,EAAE;AAC5C,CAAC;AAdD,8CAcC;AAED,SAAgB,SAAS,CAAC,KAAa,EAAE,KAAU,EAAE,MAA4B;IAC7E,IAAI,CAAC,IAAA,aAAK,EAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,CAAC,KAAK,GAAG,EAAE,CAAA;IAC3C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAA;AAC/B,CAAC;AAHD,8BAGC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "topkat-utils",
3
- "version": "1.2.47",
3
+ "version": "1.2.49",
4
4
  "type": "commonjs",
5
5
  "types": "index.ts",
6
6
  "main": "dist",
package/src/env-utils.ts CHANGED
@@ -4,7 +4,7 @@
4
4
 
5
5
  /** Parse one dimention object undefined, true, false, null represented as string will be converted to primitives */
6
6
  export function parseEnv(env) {
7
- const newEnv = {}
7
+ const newEnv = {} as Record<string, undefined | null | number | boolean | string>
8
8
  for (const k in env) {
9
9
  const val = env[k]
10
10
  if (val === 'undefined') newEnv[k] = undefined
@@ -1,20 +1,20 @@
1
1
  //----------------------------------------
2
2
  // MONGO UTILS
3
3
  //----------------------------------------
4
- import { isType } from "./validation-utils"
5
- import { isset } from "./isset"
4
+ import { isType } from './validation-utils'
5
+ import { isset } from './isset'
6
6
 
7
7
  /** @return undefined if cannot find _id */
8
- export function getId(obj: any = {}): string | undefined {
8
+ export function getId(obj: any): string | undefined {
9
9
  if (!obj) return // null case
10
10
  if (obj._id) return obj._id.toString()
11
11
  else if (isType(obj, 'objectId')) return obj.toString()
12
12
  else return
13
13
  }
14
14
 
15
- /** Merge filter with correct handling of OR and AND
16
- * @param {Object} filterA
17
- * @param {Object} filterB
15
+ /** Merge filter with correct handling of OR and AND
16
+ * @param {Object} filterA
17
+ * @param {Object} filterB
18
18
  * @param {Boolean} assignToFilterA defualt false: if true, it will modify filterA, else it will return merged filters as a new object
19
19
  */
20
20
  export function mongoFilterMerger(filterA, filterB, assignToFilterA = false) {