@axinom/mosaic-service-common 0.26.0 → 0.26.1-rc.1
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.
|
@@ -10,8 +10,8 @@ export declare const getOrdinalizedString: (orderNumber: number) => string;
|
|
|
10
10
|
* layers. Use the second parameter if specific property failed, but is not
|
|
11
11
|
* included in the data path.
|
|
12
12
|
*
|
|
13
|
-
* @example `/objects/0/property_name` turns into `Property 'property_name' of the
|
|
14
|
-
* @example `/objects/0` turns into `The
|
|
13
|
+
* @example `/objects/0/property_name` turns into `Property 'property_name' of the first object`
|
|
14
|
+
* @example `/objects/0` turns into `The first object`
|
|
15
15
|
*/
|
|
16
16
|
export declare const getJsonPropertyReadablePath: (dataPath: string, propertyName?: string | undefined) => string;
|
|
17
17
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/publishing/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,uBAAuB,EACvB,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,UAAU,CAAC;AAElB;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,gBAAiB,MAAM,KAAG,MAQ1D,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,2BAA2B,aAC5B,MAAM,wCAEf,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/publishing/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,uBAAuB,EACvB,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,UAAU,CAAC;AAElB;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,gBAAiB,MAAM,KAAG,MAQ1D,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,2BAA2B,aAC5B,MAAM,wCAEf,MAiDF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,+BAA+B,UACnC,yBAAyB,KAC/B,MAsDF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mCAAmC,8DAItC,yBAAyB,EAAE,GAAG,IAAI,GAAG,SAAS,+HAsBvD,CAAC"}
|
package/dist/publishing/utils.js
CHANGED
|
@@ -23,8 +23,8 @@ exports.getOrdinalizedString = getOrdinalizedString;
|
|
|
23
23
|
* layers. Use the second parameter if specific property failed, but is not
|
|
24
24
|
* included in the data path.
|
|
25
25
|
*
|
|
26
|
-
* @example `/objects/0/property_name` turns into `Property 'property_name' of the
|
|
27
|
-
* @example `/objects/0` turns into `The
|
|
26
|
+
* @example `/objects/0/property_name` turns into `Property 'property_name' of the first object`
|
|
27
|
+
* @example `/objects/0` turns into `The first object`
|
|
28
28
|
*/
|
|
29
29
|
const getJsonPropertyReadablePath = (dataPath, propertyName) => {
|
|
30
30
|
const hierarchy = (0, common_1.isNullOrWhitespace)(dataPath)
|
|
@@ -35,6 +35,7 @@ const getJsonPropertyReadablePath = (dataPath, propertyName) => {
|
|
|
35
35
|
hierarchy.push(propertyName);
|
|
36
36
|
}
|
|
37
37
|
let result = '';
|
|
38
|
+
let previousSegmentWasIndexed = false;
|
|
38
39
|
while (hierarchy.length > 0) {
|
|
39
40
|
const segment = hierarchy.pop();
|
|
40
41
|
// Failed property is a whole element of the array
|
|
@@ -42,11 +43,13 @@ const getJsonPropertyReadablePath = (dataPath, propertyName) => {
|
|
|
42
43
|
let arrayIndex = parseInt(segment);
|
|
43
44
|
const nth = (0, exports.getOrdinalizedString)(++arrayIndex);
|
|
44
45
|
result = `The ${nth}`;
|
|
46
|
+
previousSegmentWasIndexed = true;
|
|
45
47
|
continue;
|
|
46
48
|
}
|
|
47
49
|
// Failed property is a property of an object
|
|
48
50
|
if ((0, common_1.isNullOrWhitespace)(result) && isNaN(parseInt(segment))) {
|
|
49
51
|
result = `Property '${segment}'`;
|
|
52
|
+
previousSegmentWasIndexed = false;
|
|
50
53
|
continue;
|
|
51
54
|
}
|
|
52
55
|
// Failed property already discovered and belongs to a specific element of
|
|
@@ -55,11 +58,14 @@ const getJsonPropertyReadablePath = (dataPath, propertyName) => {
|
|
|
55
58
|
let arrayIndex = parseInt(segment);
|
|
56
59
|
const nth = (0, exports.getOrdinalizedString)(++arrayIndex);
|
|
57
60
|
result += ` of the ${nth}`;
|
|
61
|
+
previousSegmentWasIndexed = true;
|
|
58
62
|
continue;
|
|
59
63
|
}
|
|
60
64
|
// Failed property already discovered and belongs to an object
|
|
61
65
|
if (!(0, common_1.isNullOrWhitespace)(result) && isNaN(parseInt(segment))) {
|
|
62
|
-
|
|
66
|
+
const article = previousSegmentWasIndexed ? '' : ` of the`; // Already articled with e.g. `The first` or `of the first`
|
|
67
|
+
result += `${article} ${(0, inflection_1.humanize)((0, inflection_1.singularize)(segment), true)}`;
|
|
68
|
+
previousSegmentWasIndexed = false;
|
|
63
69
|
continue;
|
|
64
70
|
}
|
|
65
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/publishing/utils.ts"],"names":[],"mappings":";;;AAAA,2CAA+D;AAC/D,sCAAqD;AAOrD;;;;GAIG;AACI,MAAM,oBAAoB,GAAG,CAAC,WAAmB,EAAU,EAAE;IAClE,OAAO,WAAW,KAAK,CAAC;QACtB,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,WAAW,KAAK,CAAC;YACnB,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,WAAW,KAAK,CAAC;gBACnB,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,IAAA,uBAAU,EAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;AACzC,CAAC,CAAC;AARW,QAAA,oBAAoB,wBAQ/B;AAEF;;;;;;;GAOG;AACI,MAAM,2BAA2B,GAAG,CACzC,QAAgB,EAChB,YAAqB,EACb,EAAE;IACV,MAAM,SAAS,GAAG,IAAA,2BAAkB,EAAC,QAAQ,CAAC;QAC5C,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,IAAA,aAAI,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,YAAY,EAAE;QAChB,6DAA6D;QAC7D,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;KAC9B;IAED,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,EAAY,CAAC;QAE1C,kDAAkD;QAClD,IAAI,IAAA,2BAAkB,EAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE;YAC3D,IAAI,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YACnC,MAAM,GAAG,GAAG,IAAA,4BAAoB,EAAC,EAAE,UAAU,CAAC,CAAC;YAC/C,MAAM,GAAG,OAAO,GAAG,EAAE,CAAC;YACtB,SAAS;SACV;QAED,6CAA6C;QAC7C,IAAI,IAAA,2BAAkB,EAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE;YAC1D,MAAM,GAAG,aAAa,OAAO,GAAG,CAAC;YACjC,SAAS;SACV;QAED,0EAA0E;QAC1E,WAAW;QACX,IAAI,CAAC,IAAA,2BAAkB,EAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE;YAC5D,IAAI,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YACnC,MAAM,GAAG,GAAG,IAAA,4BAAoB,EAAC,EAAE,UAAU,CAAC,CAAC;YAC/C,MAAM,IAAI,WAAW,GAAG,EAAE,CAAC;YAC3B,SAAS;SACV;QAED,8DAA8D;QAC9D,IAAI,CAAC,IAAA,2BAAkB,EAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE;YAC3D,MAAM,IAAI,IAAI,IAAA,qBAAQ,EAAC,IAAA,wBAAW,EAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/publishing/utils.ts"],"names":[],"mappings":";;;AAAA,2CAA+D;AAC/D,sCAAqD;AAOrD;;;;GAIG;AACI,MAAM,oBAAoB,GAAG,CAAC,WAAmB,EAAU,EAAE;IAClE,OAAO,WAAW,KAAK,CAAC;QACtB,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,WAAW,KAAK,CAAC;YACnB,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,WAAW,KAAK,CAAC;gBACnB,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,IAAA,uBAAU,EAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;AACzC,CAAC,CAAC;AARW,QAAA,oBAAoB,wBAQ/B;AAEF;;;;;;;GAOG;AACI,MAAM,2BAA2B,GAAG,CACzC,QAAgB,EAChB,YAAqB,EACb,EAAE;IACV,MAAM,SAAS,GAAG,IAAA,2BAAkB,EAAC,QAAQ,CAAC;QAC5C,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,IAAA,aAAI,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,YAAY,EAAE;QAChB,6DAA6D;QAC7D,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;KAC9B;IAED,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,yBAAyB,GAAG,KAAK,CAAC;IACtC,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,EAAY,CAAC;QAE1C,kDAAkD;QAClD,IAAI,IAAA,2BAAkB,EAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE;YAC3D,IAAI,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YACnC,MAAM,GAAG,GAAG,IAAA,4BAAoB,EAAC,EAAE,UAAU,CAAC,CAAC;YAC/C,MAAM,GAAG,OAAO,GAAG,EAAE,CAAC;YACtB,yBAAyB,GAAG,IAAI,CAAC;YACjC,SAAS;SACV;QAED,6CAA6C;QAC7C,IAAI,IAAA,2BAAkB,EAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE;YAC1D,MAAM,GAAG,aAAa,OAAO,GAAG,CAAC;YACjC,yBAAyB,GAAG,KAAK,CAAC;YAClC,SAAS;SACV;QAED,0EAA0E;QAC1E,WAAW;QACX,IAAI,CAAC,IAAA,2BAAkB,EAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE;YAC5D,IAAI,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YACnC,MAAM,GAAG,GAAG,IAAA,4BAAoB,EAAC,EAAE,UAAU,CAAC,CAAC;YAC/C,MAAM,IAAI,WAAW,GAAG,EAAE,CAAC;YAC3B,yBAAyB,GAAG,IAAI,CAAC;YACjC,SAAS;SACV;QAED,8DAA8D;QAC9D,IAAI,CAAC,IAAA,2BAAkB,EAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE;YAC3D,MAAM,OAAO,GAAG,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,2DAA2D;YACvH,MAAM,IAAI,GAAG,OAAO,IAAI,IAAA,qBAAQ,EAAC,IAAA,wBAAW,EAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;YAC/D,yBAAyB,GAAG,KAAK,CAAC;YAClC,SAAS;SACV;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AApDW,QAAA,2BAA2B,+BAoDtC;AAEF;;;GAGG;AACI,MAAM,+BAA+B,GAAG,CAC7C,KAAgC,EACxB,EAAE;;IACV,IAAI,UAAU,GAAG,IAAA,mCAA2B,EAC1C,KAAK,CAAC,QAAQ,EACd,MAAA,KAAK,CAAC,MAAM,0CAAE,eAAe,CAC9B,CAAC;IAEF,IAAI,IAAA,2BAAkB,EAAC,UAAU,CAAC,EAAE;QAClC,UAAU,GAAG,iBAAiB,CAAC;KAChC;IAED,IAAI,OAAO,GAAG,KAAK,CAAC,OAAO;QACzB,CAAC,CAAC,GAAG,UAAU,IAAI,KAAK,CAAC,OAAO,GAAG;QACnC,CAAC,CAAC,iEAAiE,CAAC;IACtE,QAAQ,KAAK,CAAC,OAAO,EAAE;QACrB,KAAK,UAAU;YACb,OAAO,GAAG,GAAG,UAAU,eAAe,CAAC;YACvC,MAAM;QACR,KAAK,WAAW;YACd,OAAO;gBACL,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,KAAK,MAAK,CAAC;oBACvB,CAAC,CAAC,GAAG,UAAU,uBAAuB;oBACtC,CAAC,CAAC,GAAG,UAAU,+BAA+B,MAAA,KAAK,CAAC,MAAM,0CAAE,KAAK,cAAc,CAAC;YACpF,MAAM;QACR,KAAK,UAAU;YACb,OAAO;gBACL,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,KAAK,MAAK,CAAC;oBACvB,CAAC,CAAC,GAAG,UAAU,uBAAuB;oBACtC,CAAC,CAAC,GAAG,UAAU,+BAA+B,MAAA,KAAK,CAAC,MAAM,0CAAE,KAAK,SAAS,CAAC;YAC/E,MAAM;QACR,KAAK,SAAS;YACZ,OAAO,GAAG,GAAG,UAAU,8BAA8B,MAAA,KAAK,CAAC,MAAM,0CAAE,OAAO,IAAI,CAAC;YAC/E,MAAM;QACR,KAAK,MAAM;YACT,OAAO,GAAG,GAAG,UAAU,2CAA2C,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAC/F,IAAI,CACL,GAAG,CAAC;YACL,MAAM;QACR,KAAK,SAAS;YACZ,OAAO;gBACL,CAAC,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,SAAS,MAAK,KAAK,IAAI,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,KAAK,MAAK,CAAC,CAAC;oBAChE,CAAC,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,SAAS,MAAK,IAAI,IAAI,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,KAAK,MAAK,CAAC,CAAC;oBAC7D,CAAC,CAAC,GAAG,UAAU,+BAA+B;oBAC9C,CAAC,CAAC,GAAG,UAAU,0BACX,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,SAAS,MAAK,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EACvD,IAAI,MAAA,KAAK,CAAC,MAAM,0CAAE,KAAK,GAAG,CAAC;YACjC,MAAM;QACR,KAAK,sBAAsB;YACzB,OAAO,GAAG,GAAG,UAAU,yCAAyC,CAAC;YACjE,MAAM;QACR,KAAK,MAAM;YACT,OAAO,GAAG,GAAG,UAAU,uBAAuB,MAAA,KAAK,CAAC,MAAM,0CAAE,IAAI,IAAI,CAAC;YACrE,MAAM;KACT;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAxDW,QAAA,+BAA+B,mCAwD1C;AAEF;;;;;;GAMG;AACI,MAAM,mCAAmC,GAAG,CAIjD,MAAsD,EACtD,OAA8D,EACd,EAAE;;IAClD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QAClC,OAAO,EAAE,CAAC;KACX;IAED,MAAM,WAAW,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,mCAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,mCAAI,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC;IAE7D,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;;QAC1B,MAAM,QAAQ,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,wBAAwB,+CAAjC,OAAO,EAA6B,KAAK,CAAC,CAAC;QAC5D,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAC;SACjB;QAED,OAAO;YACL,OAAO,EAAE,IAAA,uCAA+B,EAAC,KAAK,CAAC;YAC/C,QAAQ,EAAE,WAAW,CAAC,KAAK,CAAC;YAC5B,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC;SAC3B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA1BW,QAAA,mCAAmC,uCA0B9C"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axinom/mosaic-service-common",
|
|
3
|
-
"version": "0.26.
|
|
3
|
+
"version": "0.26.1-rc.1",
|
|
4
4
|
"description": "Common helpers and PostgreSQL-related functionality",
|
|
5
5
|
"author": "Axinom",
|
|
6
6
|
"license": "PROPRIETARY",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"lint": "eslint . --ext .ts,.tsx,.js --color --cache"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@graphile/pg-pubsub": "^4.12.
|
|
32
|
+
"@graphile/pg-pubsub": "^4.12.3",
|
|
33
33
|
"ajv": "^7.0.3",
|
|
34
34
|
"ajv-formats": "^2.1.1",
|
|
35
35
|
"endent": "^2.0.1",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"prom-client": "^13.0.0",
|
|
49
49
|
"serialize-error": "^7.0.1",
|
|
50
50
|
"short-hash": "^1.0.0",
|
|
51
|
-
"uuid": "^8.3.
|
|
51
|
+
"uuid": "^8.3.2",
|
|
52
52
|
"uuid-encoder": "^1.2.0",
|
|
53
53
|
"verror": "^1.10.0"
|
|
54
54
|
},
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"@types/uuid": "^8.0.0",
|
|
61
61
|
"@types/verror": "^1.10.4",
|
|
62
62
|
"eslint": "^8.17.0",
|
|
63
|
-
"jest": "26.6.
|
|
63
|
+
"jest": "26.6.3",
|
|
64
64
|
"jest-expect-message": "^1.0.2",
|
|
65
65
|
"rimraf": "^3.0.2",
|
|
66
66
|
"ts-node": "^8.9.0",
|
|
@@ -69,5 +69,5 @@
|
|
|
69
69
|
"publishConfig": {
|
|
70
70
|
"access": "public"
|
|
71
71
|
},
|
|
72
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "3fc836f9f5e7151d752a7848c0cf3ca4f34e0c07"
|
|
73
73
|
}
|