integreat 0.8.0-beta.28 → 0.8.0-beta.29
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/dist/index.js
CHANGED
|
@@ -7,7 +7,7 @@ export { default as transformers } from './transformers/index.js';
|
|
|
7
7
|
export { default as middleware } from './middleware/index.js';
|
|
8
8
|
export { default as createAction } from './utils/createAction.js';
|
|
9
9
|
export default {
|
|
10
|
-
version: '0.8.0-beta.
|
|
10
|
+
version: '0.8.0-beta.28',
|
|
11
11
|
create,
|
|
12
12
|
mergeDefinitions,
|
|
13
13
|
mergeResources,
|
|
@@ -3,6 +3,7 @@ const __require = _createRequire(import.meta.url);
|
|
|
3
3
|
const mapAny = __require("map-any");
|
|
4
4
|
import { transform, fwd, rev, filter, ifelse, apply, iterate, } from 'map-transform';
|
|
5
5
|
import { isObject, isSchema, isPropertySchema, isDataObject, isNullOrUndefined, } from '../utils/is.js';
|
|
6
|
+
import { ensureArrayOrUndefined } from '../utils/array.js';
|
|
6
7
|
const primitiveTypes = [
|
|
7
8
|
'string',
|
|
8
9
|
'integer',
|
|
@@ -15,19 +16,19 @@ const typeFromProp = (prop) => isPropertySchema(prop) ? prop.$cast : prop;
|
|
|
15
16
|
const defaultFromProp = (prop) => {
|
|
16
17
|
if (isPropertySchema(prop)) {
|
|
17
18
|
if (prop.hasOwnProperty('$const')) {
|
|
18
|
-
return { $transform: 'fixed', value: prop.$const };
|
|
19
|
+
return [{ $transform: 'fixed', value: prop.$const }];
|
|
19
20
|
}
|
|
20
21
|
else if (prop.hasOwnProperty('$default')) {
|
|
21
|
-
return { $alt: [{ $value: prop.$default }] };
|
|
22
|
+
return [{ $alt: [{ $value: prop.$default }] }];
|
|
22
23
|
}
|
|
23
24
|
}
|
|
24
|
-
return
|
|
25
|
+
return [];
|
|
25
26
|
};
|
|
27
|
+
const unarray = (type, isArray) => isArray || type === 'unknown' ? [] : [{ $transform: 'unarray' }];
|
|
26
28
|
const hasArrayNotation = (value) => value.endsWith('[]');
|
|
27
|
-
const
|
|
28
|
-
? [
|
|
29
|
-
: [
|
|
30
|
-
const appendBrackets = (field) => `${field}[]`;
|
|
29
|
+
const removeArrayNotation = (key) => hasArrayNotation(key)
|
|
30
|
+
? [key.slice(0, key.length - 2), true]
|
|
31
|
+
: [key, false];
|
|
31
32
|
const isRef = (type) => (value) => {
|
|
32
33
|
if (!isObject(value)) {
|
|
33
34
|
return true;
|
|
@@ -37,41 +38,51 @@ const isRef = (type) => (value) => {
|
|
|
37
38
|
};
|
|
38
39
|
const transformFromType = (type) => {
|
|
39
40
|
if (primitiveTypes.includes(type)) {
|
|
40
|
-
return { $transform: type };
|
|
41
|
+
return [{ $transform: type }];
|
|
41
42
|
}
|
|
42
43
|
else if (type === 'float') {
|
|
43
|
-
return { $transform: 'number' };
|
|
44
|
+
return [{ $transform: 'number' }];
|
|
44
45
|
}
|
|
45
46
|
else if (type === 'unknown') {
|
|
46
|
-
return
|
|
47
|
+
return [];
|
|
47
48
|
}
|
|
48
49
|
else {
|
|
49
|
-
return
|
|
50
|
+
return [
|
|
51
|
+
iterate(ifelse(isRef(type), { $transform: 'reference', type }, apply(`cast_${type}`))),
|
|
52
|
+
];
|
|
50
53
|
}
|
|
51
54
|
};
|
|
55
|
+
const generateFieldPipeline = (field, isArray, pipeline) => ({
|
|
56
|
+
[field]: [
|
|
57
|
+
field,
|
|
58
|
+
isArray ? rev(transform(ensureArrayOrUndefined)) : undefined,
|
|
59
|
+
...pipeline,
|
|
60
|
+
isArray ? fwd(transform(ensureArrayOrUndefined)) : undefined,
|
|
61
|
+
].filter(Boolean),
|
|
62
|
+
});
|
|
52
63
|
const mappingFromSchema = (schema, iterate = false) => Object.entries(schema).reduce((mapping, [field, prop]) => {
|
|
64
|
+
const [realField, isFieldArray] = removeArrayNotation(field);
|
|
53
65
|
if (isSchema(prop)) {
|
|
54
66
|
return {
|
|
55
67
|
...mapping,
|
|
56
|
-
|
|
68
|
+
...generateFieldPipeline(realField, isFieldArray, [
|
|
69
|
+
mappingFromSchema(prop, hasArrayNotation(field)),
|
|
70
|
+
]),
|
|
57
71
|
};
|
|
58
72
|
}
|
|
59
73
|
const type = typeFromProp(prop);
|
|
60
74
|
if (typeof type !== 'string') {
|
|
61
75
|
return mapping;
|
|
62
76
|
}
|
|
63
|
-
const [realType,
|
|
64
|
-
const
|
|
77
|
+
const [realType, isTypeArray] = removeArrayNotation(type);
|
|
78
|
+
const isArray = isTypeArray || isFieldArray;
|
|
65
79
|
return {
|
|
66
80
|
...mapping,
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
defaultFromProp(prop),
|
|
73
|
-
transformFromType(realType),
|
|
74
|
-
].filter(Boolean),
|
|
81
|
+
...generateFieldPipeline(realField, isArray, [
|
|
82
|
+
...unarray(realType, isArray),
|
|
83
|
+
...defaultFromProp(prop),
|
|
84
|
+
...transformFromType(realType),
|
|
85
|
+
]),
|
|
75
86
|
};
|
|
76
87
|
}, iterate ? { $iterate: true } : {});
|
|
77
88
|
const includeInCasting = (type) => type
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createCastMapping.js","sourceRoot":"","sources":["../../src/schema/createCastMapping.ts"],"names":[],"mappings":";;AAAA,oCAAkC;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"createCastMapping.js","sourceRoot":"","sources":["../../src/schema/createCastMapping.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/array.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export declare function ensureArray<T = unknown>(value: T | T[]): NonNullable<T>[];
|
|
2
|
+
export declare function ensureArrayOrUndefined<T = unknown>(value: T | T[]): NonNullable<T>[] | undefined;
|
|
2
3
|
export declare function arrayIncludes<T = unknown>(a: T | T[], b: T | T[]): boolean;
|
|
3
4
|
export declare const getFirstIfArray: <T>(data: T | T[]) => T;
|
package/dist/utils/array.js
CHANGED
|
@@ -3,6 +3,9 @@ export function ensureArray(value) {
|
|
|
3
3
|
.concat(value)
|
|
4
4
|
.filter((item) => item !== undefined && item !== null);
|
|
5
5
|
}
|
|
6
|
+
export function ensureArrayOrUndefined(value) {
|
|
7
|
+
return value === undefined ? undefined : ensureArray(value);
|
|
8
|
+
}
|
|
6
9
|
export function arrayIncludes(a, b) {
|
|
7
10
|
if (Array.isArray(a) && Array.isArray(b)) {
|
|
8
11
|
return a.some((item) => b.includes(item));
|
package/dist/utils/array.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"array.js","sourceRoot":"","sources":["../../src/utils/array.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAc,KAAc;IACrD,OAAQ,EAAU;SACf,MAAM,CAAC,KAAK,CAAC;SACb,MAAM,CACL,CAAC,IAAO,EAA0B,EAAE,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,CACzE,CAAA;AACL,CAAC;AAED,MAAM,UAAU,aAAa,CAAc,CAAU,EAAE,CAAU;IAC/D,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACxC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;KAC1C;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAM,CAAC,CAAA;KAC1B;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;KACrB;SAAM;QACL,OAAO,CAAC,KAAK,CAAC,CAAA;KACf;AACH,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAI,IAAa,EAAK,EAAE,CACrD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA"}
|
|
1
|
+
{"version":3,"file":"array.js","sourceRoot":"","sources":["../../src/utils/array.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAc,KAAc;IACrD,OAAQ,EAAU;SACf,MAAM,CAAC,KAAK,CAAC;SACb,MAAM,CACL,CAAC,IAAO,EAA0B,EAAE,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,CACzE,CAAA;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,KAAc;IAEd,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;AAC7D,CAAC;AAED,MAAM,UAAU,aAAa,CAAc,CAAU,EAAE,CAAU;IAC/D,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACxC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;KAC1C;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAM,CAAC,CAAA;KAC1B;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;KACrB;SAAM;QACL,OAAO,CAAC,KAAK,CAAC,CAAA;KACf;AACH,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAI,IAAa,EAAK,EAAE,CACrD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA"}
|
package/package.json
CHANGED