@thymian/plugin-sampler 0.1.8 → 0.1.9-canary.20260513-e6b82ed
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/generation/content-type-strategies/json.content-type-strategy.js +1 -1
- package/dist/generation/content-type-strategies/json.content-type-strategy.js.map +1 -1
- package/dist/generation/content-type-strategies/xml.content-type-strategy.js +1 -1
- package/dist/generation/content-type-strategies/xml.content-type-strategy.js.map +1 -1
- package/dist/hooks/generate-request-types.d.ts +1 -0
- package/dist/hooks/generate-request-types.d.ts.map +1 -1
- package/dist/hooks/generate-request-types.js +32 -29
- package/dist/hooks/generate-request-types.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/samples-structure/read-samples-from-dir.d.ts.map +1 -1
- package/dist/samples-structure/read-samples-from-dir.js +8 -7
- package/dist/samples-structure/read-samples-from-dir.js.map +1 -1
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +8 -4
- package/dist/utils.js.map +1 -1
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.content-type-strategy.js","sourceRoot":"","sources":["../../../src/generation/content-type-strategies/json.content-type-strategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAOzC,MAAM,OAAO,uBAAuB;IAClC,OAAO,CAAC,WAAmB;QACzB,OAAO,mCAAmC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAqB;QAClC,OAAO;YACL,QAAQ,EAAE,MAAM,CAAC,MAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"json.content-type-strategy.js","sourceRoot":"","sources":["../../../src/generation/content-type-strategies/json.content-type-strategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAOzC,MAAM,OAAO,uBAAuB;IAClC,OAAO,CAAC,WAAmB;QACzB,OAAO,mCAAmC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAqB;QAClC,OAAO;YACL,QAAQ,EAAE,MAAM,CAAC,MAAuB,EAAE,EAAE,EAAE,MAAM,CAAC;SACtD,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xml.content-type-strategy.js","sourceRoot":"","sources":["../../../src/generation/content-type-strategies/xml.content-type-strategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAOzC,MAAM,OAAO,sBAAsB;IACjC,OAAO,CAAC,WAAmB;QACzB,OAAO,kCAAkC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAqB;QAClC,OAAO;YACL,SAAS,EAAE,OAAO;YAClB,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,MAAM,CAAC,IAAI,CAClB,MAAM,CAAC,MAAuB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAW,
|
|
1
|
+
{"version":3,"file":"xml.content-type-strategy.js","sourceRoot":"","sources":["../../../src/generation/content-type-strategies/xml.content-type-strategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAOzC,MAAM,OAAO,sBAAsB;IACjC,OAAO,CAAC,WAAmB;QACzB,OAAO,kCAAkC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAqB;QAClC,OAAO;YACL,SAAS,EAAE,OAAO;YAClB,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,MAAM,CAAC,IAAI,CAClB,MAAM,CAAC,MAAuB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,MAAM,CAAW,CACrE;SACF,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type Parameter, type ThymianFormat } from '@thymian/core';
|
|
2
2
|
export declare function generateTypeForSchema(schema: unknown, mediaType: string, typeName: string): Promise<GeneratedSchemaType>;
|
|
3
|
+
export declare function convertDefsToDefinitions(input: any): unknown;
|
|
3
4
|
export declare function generateTypeForParameters(parameters: Record<string, Parameter>, nextTypeName: () => string): Promise<ParameterType>;
|
|
4
5
|
export type GeneratedSchemaType = {
|
|
5
6
|
declarations: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-request-types.d.ts","sourceRoot":"","sources":["../../src/hooks/generate-request-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,aAAa,EAEnB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"generate-request-types.d.ts","sourceRoot":"","sources":["../../src/hooks/generate-request-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,aAAa,EAEnB,MAAM,eAAe,CAAC;AAIvB,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,mBAAmB,CAAC,CA8B9B;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAkC5D;AAED,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EACrC,YAAY,EAAE,MAAM,MAAM,GACzB,OAAO,CAAC,aAAa,CAAC,CAuCxB;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAAG;IAChD,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,aAAa,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,MAAM,CACX,MAAM,EACN;QACE,GAAG,EAAE;YACH,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,KAAK,EAAE,aAAa,CAAC;YACrB,IAAI,EAAE,aAAa,CAAC;YACpB,OAAO,EAAE,aAAa,CAAC;SACxB,CAAC;QACF,GAAG,EAAE,YAAY,EAAE,CAAC;KACrB,CACF,CAAC;IACF,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,UAAU,4tKA8NtB,CAAC;AAEF,eAAO,MAAM,QAAQ,wTAUpB,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,cAAc,GAAG,MAAM,CAuExE;AAWD,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,cAAc,CAAC,CAoIzB"}
|
|
@@ -1,52 +1,55 @@
|
|
|
1
1
|
import { isEdgeType, thymianHttpRequestToUrl, } from '@thymian/core';
|
|
2
2
|
import CodeBlockWriter from 'code-block-writer';
|
|
3
3
|
import { compile } from 'json-schema-to-typescript';
|
|
4
|
-
function escapeJsonPointerSegment(segment) {
|
|
5
|
-
return String(segment).replace(/~/g, '~0').replace(/\//g, '~1');
|
|
6
|
-
}
|
|
7
|
-
function normalizeCircularSchemaRefs(schema) {
|
|
8
|
-
const activeStack = new Map();
|
|
9
|
-
const recurse = (current, path) => {
|
|
10
|
-
if (typeof current !== 'object' || current === null) {
|
|
11
|
-
return current;
|
|
12
|
-
}
|
|
13
|
-
if (activeStack.has(current)) {
|
|
14
|
-
return { $ref: activeStack.get(current) };
|
|
15
|
-
}
|
|
16
|
-
activeStack.set(current, path);
|
|
17
|
-
let result;
|
|
18
|
-
if (Array.isArray(current)) {
|
|
19
|
-
result = current.map((item, index) => recurse(item, `${path}/${index}`));
|
|
20
|
-
}
|
|
21
|
-
else {
|
|
22
|
-
result = Object.fromEntries(Object.entries(current).map(([key, value]) => [
|
|
23
|
-
key,
|
|
24
|
-
recurse(value, `${path}/${escapeJsonPointerSegment(key)}`),
|
|
25
|
-
]));
|
|
26
|
-
}
|
|
27
|
-
activeStack.delete(current);
|
|
28
|
-
return result;
|
|
29
|
-
};
|
|
30
|
-
return recurse(schema, '#');
|
|
31
|
-
}
|
|
32
4
|
export async function generateTypeForSchema(schema, mediaType, typeName) {
|
|
33
5
|
const normalizedMediaType = mediaType.split(';', 1)[0]?.trim().toLowerCase();
|
|
34
6
|
if (!(normalizedMediaType === 'application/json' ||
|
|
35
7
|
normalizedMediaType?.includes('+json'))) {
|
|
36
8
|
return { declarations: [], type: 'unknown' };
|
|
37
9
|
}
|
|
38
|
-
const declaration = await compile(
|
|
10
|
+
const declaration = await compile(convertDefsToDefinitions(structuredClone(schema)), typeName, {
|
|
39
11
|
bannerComment: '',
|
|
40
12
|
additionalProperties: true,
|
|
41
13
|
style: {
|
|
42
14
|
semi: false,
|
|
43
15
|
},
|
|
16
|
+
$refOptions: {
|
|
17
|
+
mutateInputSchema: true,
|
|
18
|
+
},
|
|
44
19
|
});
|
|
45
20
|
return {
|
|
46
21
|
declarations: [declaration],
|
|
47
22
|
type: typeName,
|
|
48
23
|
};
|
|
49
24
|
}
|
|
25
|
+
export function convertDefsToDefinitions(input) {
|
|
26
|
+
if (input === null || typeof input !== 'object') {
|
|
27
|
+
return input;
|
|
28
|
+
}
|
|
29
|
+
if (Array.isArray(input)) {
|
|
30
|
+
return input.map((item) => convertDefsToDefinitions(item));
|
|
31
|
+
}
|
|
32
|
+
const result = Object.keys(input).reduce((acc, key) => {
|
|
33
|
+
const newKey = key === '$defs' ? 'definitions' : key;
|
|
34
|
+
let value = input[key];
|
|
35
|
+
if (key === '$ref' && typeof value === 'string') {
|
|
36
|
+
value = value.replace(/\/\$defs\//g, '/definitions/');
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
value = convertDefsToDefinitions(value);
|
|
40
|
+
}
|
|
41
|
+
acc[newKey] = value;
|
|
42
|
+
return acc;
|
|
43
|
+
}, {});
|
|
44
|
+
// if there is a top-level $ref we need to wrap it into an "allOf" because
|
|
45
|
+
// json-schema-to-typescript fails for such a top-level "$ref"
|
|
46
|
+
if (result.$ref && result.definitions) {
|
|
47
|
+
const refValue = result.$ref;
|
|
48
|
+
delete result.$ref;
|
|
49
|
+
result.allOf = [{ $ref: refValue }];
|
|
50
|
+
}
|
|
51
|
+
return result;
|
|
52
|
+
}
|
|
50
53
|
export async function generateTypeForParameters(parameters, nextTypeName) {
|
|
51
54
|
const result = {
|
|
52
55
|
declarations: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-request-types.js","sourceRoot":"","sources":["../../src/hooks/generate-request-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAGV,uBAAuB,GACxB,MAAM,eAAe,CAAC;AACvB,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAmB,MAAM,2BAA2B,CAAC;AAErE,
|
|
1
|
+
{"version":3,"file":"generate-request-types.js","sourceRoot":"","sources":["../../src/hooks/generate-request-types.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,uBAAuB,EAG5B,KAAK,sBAAsB,EAE3B,KAAK,aAAa,EAClB,KAAK,aAAa,EACnB,MAAM,eAAe,CAAC;AAkBvB,OAAO,QAAQ,eAAe,CAAC;IAC7B,UAAU,cAAc;QACtB,cAAc,EAAE;YACd,KAAK,EAAE;gBACL,MAAM,EAAE,uBAAuB,CAAC;gBAChC,SAAS,CAAC,EAAE,OAAO,CAAC;aACrB,CAAC;YACF,QAAQ,EAAE,IAAI,CAAC;SAChB,CAAC;QAEF,qBAAqB,EAAE;YACrB,KAAK,EAAE;gBACL,WAAW,EAAE,sBAAsB,CAAC;gBACpC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;aACnC,CAAC;YACF,QAAQ,EAAE,mBAAmB,CAAC;SAC/B,CAAC;QAEF,sBAAsB,EAAE;YACtB,KAAK,EAAE;gBACL,WAAW,EAAE,MAAM,CAAC;gBACpB,MAAM,EAAE,aAAa,CAAC;aACvB,CAAC;YACF,QAAQ,EAAE;gBAAE,QAAQ,EAAE,OAAO,CAAC;gBAAC,SAAS,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC;SACrD,CAAC;QAEF,+BAA+B,EAAE;YAC/B,KAAK,EAAE;gBACL,aAAa,EAAE,MAAM,CAAC;aACvB,CAAC;YACF,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;SAC9B,CAAC;KACH;CACF;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,aAAa,CAAC,OAAO,CAAC,oBAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,uBAAuB,EAG5B,KAAK,sBAAsB,EAE3B,KAAK,aAAa,EAClB,KAAK,aAAa,EACnB,MAAM,eAAe,CAAC;AAkBvB,OAAO,QAAQ,eAAe,CAAC;IAC7B,UAAU,cAAc;QACtB,cAAc,EAAE;YACd,KAAK,EAAE;gBACL,MAAM,EAAE,uBAAuB,CAAC;gBAChC,SAAS,CAAC,EAAE,OAAO,CAAC;aACrB,CAAC;YACF,QAAQ,EAAE,IAAI,CAAC;SAChB,CAAC;QAEF,qBAAqB,EAAE;YACrB,KAAK,EAAE;gBACL,WAAW,EAAE,sBAAsB,CAAC;gBACpC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;aACnC,CAAC;YACF,QAAQ,EAAE,mBAAmB,CAAC;SAC/B,CAAC;QAEF,sBAAsB,EAAE;YACtB,KAAK,EAAE;gBACL,WAAW,EAAE,MAAM,CAAC;gBACpB,MAAM,EAAE,aAAa,CAAC;aACvB,CAAC;YACF,QAAQ,EAAE;gBAAE,QAAQ,EAAE,OAAO,CAAC;gBAAC,SAAS,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC;SACrD,CAAC;QAEF,+BAA+B,EAAE;YAC/B,KAAK,EAAE;gBACL,aAAa,EAAE,MAAM,CAAC;aACvB,CAAC;YACF,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;SAC9B,CAAC;KACH;CACF;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,aAAa,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAiMrE,CAAC;AAEF,eAAe,YAAY,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -94,11 +94,14 @@ export const samplePlugin = {
|
|
|
94
94
|
emitter.onAction('sampler.init', async ({ format, overwrite }, ctx) => {
|
|
95
95
|
const parsedFormat = ThymianFormat.import(format);
|
|
96
96
|
const samples = await generateSamplesForThymianFormat(parsedFormat, emitter);
|
|
97
|
+
logger.debug('Generated samples for thymian format.');
|
|
97
98
|
const generatedTypes = await generateTypesForThymianFormat(parsedFormat);
|
|
99
|
+
logger.debug('Generated types for thymian format.');
|
|
98
100
|
await writeSamplesToDir(samples, generatedTypes.keyToTransactionId, {
|
|
99
101
|
path: basePath,
|
|
100
102
|
mode: typeof overwrite === 'boolean' ? 'overwrite' : 'failIfExist',
|
|
101
103
|
});
|
|
104
|
+
logger.debug(`Wrote samples at ${basePath}`);
|
|
102
105
|
await writeFile(join(basePath, 'types.d.ts'), generatedTypesToString(generatedTypes));
|
|
103
106
|
await writeFile(join(basePath, 'tsconfig.json'), JSON.stringify(tsConfig, null, 2));
|
|
104
107
|
ctx.reply();
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-samples-from-dir.d.ts","sourceRoot":"","sources":["../../src/samples-structure/read-samples-from-dir.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EACV,aAAa,EACb,iBAAiB,EAClB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAGL,KAAK,KAAK,EACX,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EACV,KAAK,EACL,IAAI,EACJ,SAAS,EAET,WAAW,EAEX,gBAAgB,EACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,6BAA6B,CAAC;AAIrC,wBAAsB,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAc3D;AAED,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EACjC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAuBxC;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"read-samples-from-dir.d.ts","sourceRoot":"","sources":["../../src/samples-structure/read-samples-from-dir.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EACV,aAAa,EACb,iBAAiB,EAClB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAGL,KAAK,KAAK,EACX,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EACV,KAAK,EACL,IAAI,EACJ,SAAS,EAET,WAAW,EAEX,gBAAgB,EACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,6BAA6B,CAAC;AAIrC,wBAAsB,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAc3D;AAED,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EACjC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAuBxC;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAqD5E;AAED,wBAAsB,kBAAkB,CACtC,CAAC,SAAS,OAAO,CAAC,IAAI,EAAE,WAAW,GAAG,gBAAgB,CAAC,CAAC,MAAM,CAAC,EAC/D,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAoC7C;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAiCrE;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,WAAW,GAAG,gBAAgB,CAAC,CAAC,MAAM,CAAC,GAC1D,MAAM,CASR;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC,CAgDf;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,gBAAgB,CAAC,CAwB3B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { readdir, readFile } from 'node:fs/promises';
|
|
2
2
|
import { type } from 'node:os';
|
|
3
|
-
import { basename, join } from 'node:path';
|
|
3
|
+
import { basename, dirname, join } from 'node:path';
|
|
4
4
|
import { ThymianBaseError } from '@thymian/core';
|
|
5
5
|
import { createJiti } from 'jiti';
|
|
6
6
|
import { AFTER_EACH_HOOK, AUTHORIZE_HOOK, BEFORE_EACH_HOOK, SAMPLE_FILE, } from '../constants.js';
|
|
@@ -40,6 +40,7 @@ export async function extractParameterValues(parameters, basePath) {
|
|
|
40
40
|
}
|
|
41
41
|
export async function extractSample(path) {
|
|
42
42
|
const sampleFile = await readFile(path, 'utf-8');
|
|
43
|
+
const requestsDir = dirname(path);
|
|
43
44
|
let fileSample;
|
|
44
45
|
try {
|
|
45
46
|
fileSample = JSON.parse(sampleFile);
|
|
@@ -54,19 +55,19 @@ export async function extractSample(path) {
|
|
|
54
55
|
}
|
|
55
56
|
const sample = {
|
|
56
57
|
authorize: fileSample.authorize,
|
|
57
|
-
cookies: await extractParameterValues(fileSample.cookies,
|
|
58
|
-
headers: await extractParameterValues(fileSample.headers,
|
|
58
|
+
cookies: await extractParameterValues(fileSample.cookies, requestsDir),
|
|
59
|
+
headers: await extractParameterValues(fileSample.headers, requestsDir),
|
|
59
60
|
method: fileSample.method,
|
|
60
61
|
origin: fileSample.origin,
|
|
61
62
|
path: fileSample.path,
|
|
62
|
-
pathParameters: await extractParameterValues(fileSample.pathParameters,
|
|
63
|
-
query: await extractParameterValues(fileSample.query,
|
|
63
|
+
pathParameters: await extractParameterValues(fileSample.pathParameters, requestsDir),
|
|
64
|
+
query: await extractParameterValues(fileSample.query, requestsDir),
|
|
64
65
|
bodyEncoding: fileSample.bodyEncoding,
|
|
65
66
|
};
|
|
66
67
|
if (fileSample.body) {
|
|
67
68
|
if (isFileValue(fileSample.body)) {
|
|
68
|
-
const bodyPath = join(
|
|
69
|
-
checkForSafePath(bodyPath,
|
|
69
|
+
const bodyPath = join(requestsDir, fileSample.body.$file);
|
|
70
|
+
checkForSafePath(bodyPath, requestsDir);
|
|
70
71
|
sample.body = {
|
|
71
72
|
$content: await readFile(bodyPath, (fileSample.body.$encoding ??
|
|
72
73
|
fileSample.bodyEncoding ??
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-samples-from-dir.js","sourceRoot":"","sources":["../../src/samples-structure/read-samples-from-dir.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"read-samples-from-dir.js","sourceRoot":"","sources":["../../src/samples-structure/read-samples-from-dir.ts"],"names":[],"mappings":"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"}
|
package/dist/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAKA,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAKA,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAmBpE;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOhE"}
|
package/dist/utils.js
CHANGED
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
import { access } from 'node:fs/promises';
|
|
2
|
-
import { resolve } from 'node:path';
|
|
2
|
+
import { isAbsolute, relative, resolve, sep } from 'node:path';
|
|
3
3
|
import { ThymianBaseError } from '@thymian/core';
|
|
4
4
|
export function sanitize(name) {
|
|
5
5
|
return decodeURIComponent(name).replace(/[^a-z0-9.-]/gi, '_');
|
|
6
6
|
}
|
|
7
7
|
export function checkForSafePath(path, baseDir) {
|
|
8
|
-
const
|
|
9
|
-
const
|
|
8
|
+
const resolvedBaseDir = resolve(baseDir);
|
|
9
|
+
const resolvedPath = resolve(resolvedBaseDir, path);
|
|
10
|
+
const relativePath = relative(resolvedBaseDir, resolvedPath);
|
|
11
|
+
const isSafe = relativePath !== '..' &&
|
|
12
|
+
!relativePath.startsWith(`..${sep}`) &&
|
|
13
|
+
!isAbsolute(relativePath);
|
|
10
14
|
if (!isSafe) {
|
|
11
|
-
throw new ThymianBaseError(
|
|
15
|
+
throw new ThymianBaseError(`Access denied. Path "${resolvedPath}" is outside of the base directory "${resolvedBaseDir}".`, {
|
|
12
16
|
name: 'PathTraversalError',
|
|
13
17
|
ref: 'https://thymian.dev/references/errors/path-traversal-error/',
|
|
14
18
|
});
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAE/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,UAAU,QAAQ,CAAC,IAAY;IACnC,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,OAAe;IAC5D,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,YAAY,GAAG,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IAE7D,MAAM,MAAM,GACV,YAAY,KAAK,IAAI;QACrB,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,GAAG,EAAE,CAAC;QACpC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IAE5B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,gBAAgB,CACxB,wBAAwB,YAAY,uCAAuC,eAAe,IAAI,EAC9F;YACE,IAAI,EAAE,oBAAoB;YAC1B,GAAG,EAAE,6DAA6D;SACnE,CACF,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAY;IAC5C,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thymian/plugin-sampler",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.9-canary.20260513-e6b82ed",
|
|
4
4
|
"description": "Thymian plugin for generating HTTP request samples from API descriptions",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"bugs": {
|
|
@@ -41,9 +41,9 @@
|
|
|
41
41
|
"!**/*.tsbuildinfo"
|
|
42
42
|
],
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@thymian/common-cli": "0.1.
|
|
45
|
-
"@thymian/core": "0.1.
|
|
46
|
-
"@thymian/plugin-request-dispatcher": "0.1.
|
|
44
|
+
"@thymian/common-cli": "0.1.9-canary.20260513-e6b82ed",
|
|
45
|
+
"@thymian/core": "0.1.9-canary.20260513-e6b82ed",
|
|
46
|
+
"@thymian/plugin-request-dispatcher": "0.1.9-canary.20260513-e6b82ed",
|
|
47
47
|
"code-block-writer": "^13.0.3",
|
|
48
48
|
"jiti": "^2.6.1",
|
|
49
49
|
"json-schema-to-typescript": "^15.0.4",
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
}
|
|
64
64
|
},
|
|
65
65
|
"devDependencies": {
|
|
66
|
-
"@thymian/core-testing": "0.1.
|
|
66
|
+
"@thymian/core-testing": "0.1.9-canary.20260513-e6b82ed",
|
|
67
67
|
"fast-json-stable-stringify": "^2.1.0",
|
|
68
68
|
"ts-morph": "^27.0.2"
|
|
69
69
|
}
|