@ama-openapi/core 14.0.0-rc.3 → 14.0.0-rc.8
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/README.md +1 -1
- package/package.json +7 -7
- package/src/core/manifest/extract-dependency-models.mjs +3 -3
- package/src/core/manifest/extract-dependency-models.mjs.map +1 -1
- package/src/schema/mask/generate-mask-from-model.d.mts +2 -2
- package/src/schema/mask/generate-mask-from-model.d.mts.map +1 -1
- package/src/schema/mask/generate-mask-from-model.mjs +6 -5
- package/src/schema/mask/generate-mask-from-model.mjs.map +1 -1
package/README.md
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
# @ama-openapi/core Documentation
|
|
2
2
|
|
|
3
3
|
> [!WARNING]
|
|
4
|
-
> [Experimental](https://github.com/AmadeusITGroup/otter/blob/main/README.md#experimental): This package is available in early access,
|
|
4
|
+
> [Experimental](https://github.com/AmadeusITGroup/otter/blob/main/README.md#experimental): This package is available in early access, the final version will be released in v15.
|
|
5
5
|
|
|
6
6
|
[](https://www.npmjs.com/package/@ama-openapi/core)
|
|
7
7
|
[](https://www.npmjs.com/package/@ama-openapi/core)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ama-openapi/core",
|
|
3
|
-
"version": "14.0.0-rc.
|
|
3
|
+
"version": "14.0.0-rc.8",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -63,10 +63,10 @@
|
|
|
63
63
|
"@nx/eslint-plugin": "~22.3.3",
|
|
64
64
|
"@nx/jest": "~22.3.3",
|
|
65
65
|
"@nx/js": "~22.3.3",
|
|
66
|
-
"@o3r/build-helpers": "~14.0.0-rc.
|
|
67
|
-
"@o3r/eslint-plugin": "~14.0.0-rc.
|
|
68
|
-
"@o3r/telemetry": "~14.0.0-rc.
|
|
69
|
-
"@o3r/test-helpers": "~14.0.0-rc.
|
|
66
|
+
"@o3r/build-helpers": "~14.0.0-rc.8",
|
|
67
|
+
"@o3r/eslint-plugin": "~14.0.0-rc.8",
|
|
68
|
+
"@o3r/telemetry": "~14.0.0-rc.8",
|
|
69
|
+
"@o3r/test-helpers": "~14.0.0-rc.8",
|
|
70
70
|
"@stylistic/eslint-plugin": "~5.6.0",
|
|
71
71
|
"@types/jest": "~30.0.0",
|
|
72
72
|
"@types/js-yaml": "^4.0.5",
|
|
@@ -95,14 +95,14 @@
|
|
|
95
95
|
"jest-util": "~30.2.0",
|
|
96
96
|
"jsonc-eslint-parser": "~2.4.0",
|
|
97
97
|
"memfs": "~4.50.0",
|
|
98
|
-
"nx": "~22.
|
|
98
|
+
"nx": "~22.4.0",
|
|
99
99
|
"ts-jest": "~29.4.0",
|
|
100
100
|
"type-fest": "^5.3.1",
|
|
101
101
|
"typescript": "~5.9.2",
|
|
102
102
|
"typescript-eslint": "~8.52.0"
|
|
103
103
|
},
|
|
104
104
|
"engines": {
|
|
105
|
-
"node": "^
|
|
105
|
+
"node": "^22.17.0 || ^24.0.0"
|
|
106
106
|
},
|
|
107
107
|
"contributors": [
|
|
108
108
|
{
|
|
@@ -70,7 +70,7 @@ const extractDependencyModelsSimple = async (cwd, artifactName, modelName, logge
|
|
|
70
70
|
const path = typeof modelName === 'string' ? modelName : artifactName;
|
|
71
71
|
const { filePath, innerPath } = splitModelPath(path);
|
|
72
72
|
const modelPath = typeof modelName === 'string' ? join(artifactBasePath, filePath) : require.resolve(artifactName);
|
|
73
|
-
const content = await fs.readFile(
|
|
73
|
+
const content = await fs.readFile(modelPath, { encoding: 'utf8' });
|
|
74
74
|
const model = { path };
|
|
75
75
|
const fileNameOutput = getOutFilePathFromModelPath(model.path);
|
|
76
76
|
const outputFilePath = resolve(cwd, outputDirectory, sanitizePackagePath(artifactName), fileNameOutput);
|
|
@@ -106,8 +106,8 @@ export const extractDependencyModelsObject = async (artifactName, model, transfo
|
|
|
106
106
|
const path = model.path || require.resolve(artifactName).split(artifactName)[1];
|
|
107
107
|
const { filePath, innerPath } = splitModelPath(path);
|
|
108
108
|
const modelPath = model.path ? join(artifactBasePath, filePath) : require.resolve(artifactName);
|
|
109
|
-
const content = await fs.readFile(
|
|
110
|
-
logger?.debug?.(`extracting model ${modelPath}
|
|
109
|
+
const content = await fs.readFile(modelPath, { encoding: 'utf8' });
|
|
110
|
+
logger?.debug?.(`extracting model ${modelPath} to ${outputDirectory}`);
|
|
111
111
|
const fileNameOutput = transform?.rename
|
|
112
112
|
? filePath.replace(new RegExp(`(${basename(filePath).replaceAll('.', '\\.')})$`), transform.rename)
|
|
113
113
|
: getOutFilePathFromModelPath(path);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-dependency-models.mjs","sourceRoot":"","sources":["../../../../src/core/manifest/extract-dependency-models.mts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"extract-dependency-models.mjs","sourceRoot":"","sources":["../../../../src/core/manifest/extract-dependency-models.mts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export interface MaskContext extends Context {
|
|
|
15
15
|
* @param modelPath Path to the model
|
|
16
16
|
* @param ctx Mask context
|
|
17
17
|
*/
|
|
18
|
-
export declare const generateMaskSchemaModelAt: (modelPath: string, ctx: MaskContext) => Promise<Record<string, any
|
|
18
|
+
export declare const generateMaskSchemaModelAt: (modelPath: string, ctx: MaskContext) => Promise<Record<string, any> | undefined>;
|
|
19
19
|
/**
|
|
20
20
|
* Recursive function to generate a JSON Schema of a mask which can be applied to the provided model object and its children
|
|
21
21
|
* Note: this function is recursive and exported only for testing purposes
|
|
@@ -23,5 +23,5 @@ export declare const generateMaskSchemaModelAt: (modelPath: string, ctx: MaskCon
|
|
|
23
23
|
* @param model Model object
|
|
24
24
|
* @param ctx Mask context
|
|
25
25
|
*/
|
|
26
|
-
export declare const generateMaskSchemaFromModel: (model: any, ctx: MaskContext) => Promise<Record<string, any
|
|
26
|
+
export declare const generateMaskSchemaFromModel: (model: any, ctx: MaskContext) => Promise<Record<string, any> | undefined>;
|
|
27
27
|
//# sourceMappingURL=generate-mask-from-model.d.mts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-mask-from-model.d.mts","sourceRoot":"","sources":["../../../../src/schema/mask/generate-mask-from-model.mts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,OAAO,EACR,MAAM,mBAAmB,CAAC;AAY3B,mBAAmB;AACnB,MAAM,WAAW,WAAY,SAAQ,OAAO;IAC1C,4CAA4C;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,iEAAiE;IACjE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,mBAAmB;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GAAU,WAAW,MAAM,EAAE,KAAK,WAAW,
|
|
1
|
+
{"version":3,"file":"generate-mask-from-model.d.mts","sourceRoot":"","sources":["../../../../src/schema/mask/generate-mask-from-model.mts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,OAAO,EACR,MAAM,mBAAmB,CAAC;AAY3B,mBAAmB;AACnB,MAAM,WAAW,WAAY,SAAQ,OAAO;IAC1C,4CAA4C;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,iEAAiE;IACjE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,mBAAmB;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GAAU,WAAW,MAAM,EAAE,KAAK,WAAW,6CAyDlF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,2BAA2B,GAAU,OAAO,GAAG,EAAE,KAAK,WAAW,KAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAsEvH,CAAC"}
|
|
@@ -15,7 +15,7 @@ export const generateMaskSchemaModelAt = async (modelPath, ctx) => {
|
|
|
15
15
|
}
|
|
16
16
|
if (ctx.parsedFiles?.includes(modelPath)) {
|
|
17
17
|
logger?.warn(`The reference ${modelPath} is circular, it will be resolve to "any"`);
|
|
18
|
-
return
|
|
18
|
+
return undefined;
|
|
19
19
|
}
|
|
20
20
|
const [filePath, innerPath] = modelPath.split('#/');
|
|
21
21
|
let model = await parseFile(filePath);
|
|
@@ -79,7 +79,7 @@ export const generateMaskSchemaFromModel = async (model, ctx) => {
|
|
|
79
79
|
if (Array.isArray(model)) {
|
|
80
80
|
return {
|
|
81
81
|
type: 'array',
|
|
82
|
-
prefixItems: await Promise.all(model.map((item) => generateMaskSchemaFromModel(item, ctx)))
|
|
82
|
+
prefixItems: (await Promise.all(model.map((item) => generateMaskSchemaFromModel(item, ctx)))).filter((item) => !!item)
|
|
83
83
|
};
|
|
84
84
|
}
|
|
85
85
|
// Is referencing another model
|
|
@@ -97,13 +97,14 @@ export const generateMaskSchemaFromModel = async (model, ctx) => {
|
|
|
97
97
|
? {
|
|
98
98
|
properties: {
|
|
99
99
|
type: 'object',
|
|
100
|
-
properties: Object.fromEntries(await Promise.all(Object.entries(model.properties)
|
|
100
|
+
properties: Object.fromEntries((await Promise.all(Object.entries(model.properties)
|
|
101
|
+
.map(async ([key, value]) => ([key, await generateMaskSchemaFromModel(value, ctx)])))).filter(([, value]) => !!value))
|
|
101
102
|
}
|
|
102
103
|
}
|
|
103
104
|
: {},
|
|
104
|
-
...Object.fromEntries(await Promise.all(Object.entries(model)
|
|
105
|
+
...Object.fromEntries((await Promise.all(Object.entries(model)
|
|
105
106
|
.filter(([key]) => !['properties', 'type', '$ref'].includes(key))
|
|
106
|
-
.map(async ([key, value]) => ([key, await generateMaskSchemaFromModel(value, ctx)]))))
|
|
107
|
+
.map(async ([key, value]) => ([key, await generateMaskSchemaFromModel(value, ctx)])))).filter(([, value]) => !!value))
|
|
107
108
|
}
|
|
108
109
|
};
|
|
109
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-mask-from-model.mjs","sourceRoot":"","sources":["../../../../src/schema/mask/generate-mask-from-model.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,KAAK,EACL,GAAG,GACJ,MAAM,WAAW,CAAC;AAInB,OAAO,EACL,SAAS,GACV,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EACL,oBAAoB,EACpB,eAAe,GAChB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,gBAAgB,GACjB,MAAM,8BAA8B,CAAC;AActC;;;;GAIG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAAE,SAAiB,EAAE,GAAgB,EAAE,EAAE;IACrF,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IAEvB,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3C,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;QACjB,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC;IACnF,CAAC;IAED,IAAI,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,MAAM,EAAE,IAAI,CAAC,iBAAiB,SAAS,2CAA2C,CAAC,CAAC;QACpF,OAAO,
|
|
1
|
+
{"version":3,"file":"generate-mask-from-model.mjs","sourceRoot":"","sources":["../../../../src/schema/mask/generate-mask-from-model.mts"],"names":[],"mappings":"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"}
|