@smartlyio/oats-mirage-adapter 4.3.0 → 4.4.0
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.d.ts +1 -0
- package/dist/index.js +10 -8
- package/dist/index.js.map +1 -1
- package/index.ts +16 -8
- package/package.json +6 -6
package/dist/index.d.ts
CHANGED
|
@@ -11,4 +11,5 @@ export declare function bind<Spec, Models extends mirageTypes.AnyModels = never,
|
|
|
11
11
|
handler: runtime.server.HandlerFactory<Spec>;
|
|
12
12
|
spec: Spec;
|
|
13
13
|
requestContextCreator?: (schema: Schema<Registry<Models, Factories>>) => RequestContext;
|
|
14
|
+
logging?: boolean;
|
|
14
15
|
}): void;
|
package/dist/index.js
CHANGED
|
@@ -38,7 +38,9 @@ async function handleFormData(value) {
|
|
|
38
38
|
}
|
|
39
39
|
return result;
|
|
40
40
|
}
|
|
41
|
-
function adapter(mirageServer, requestContextCreator) {
|
|
41
|
+
function adapter(mirageServer, requestContextCreator, opts) {
|
|
42
|
+
// eslint-disable-next-line no-console, @typescript-eslint/no-empty-function
|
|
43
|
+
const log = (opts === null || opts === void 0 ? void 0 : opts.logging) !== false ? console.log : () => { };
|
|
42
44
|
return (path, op, method, handler) => {
|
|
43
45
|
const miragePath = path.replace(/{([^}]+)}/g, (m, param) => ':' + param);
|
|
44
46
|
const mirageHandler = mirageServer[method];
|
|
@@ -61,19 +63,16 @@ function adapter(mirageServer, requestContextCreator) {
|
|
|
61
63
|
body,
|
|
62
64
|
requestContext: requestContextCreator(schema, request)
|
|
63
65
|
};
|
|
64
|
-
|
|
65
|
-
console.log('oats-mirage-adapter request', ctx);
|
|
66
|
+
log('oats-mirage-adapter request', ctx);
|
|
66
67
|
try {
|
|
67
68
|
const result = await handler(ctx);
|
|
68
|
-
|
|
69
|
-
console.log('oats-mirage-adapter response', { result });
|
|
69
|
+
log('oats-mirage-adapter response', { result });
|
|
70
70
|
return new mirage.Response(result.status, Object.assign(Object.assign({}, result.headers), { 'content-type': result.value.contentType }), result.value.contentType.match(/application\/json/)
|
|
71
71
|
? JSON.stringify(result.value.value)
|
|
72
72
|
: result.value.value);
|
|
73
73
|
}
|
|
74
74
|
catch (error) {
|
|
75
|
-
|
|
76
|
-
console.log('oats-mirage-adapter handler threw: ' + error.message, { error });
|
|
75
|
+
log('oats-mirage-adapter handler threw: ' + error.message, { error });
|
|
77
76
|
return new mirage.Response(400, { 'content-type': 'text/plain' }, 'Error from handler: ' + error.message);
|
|
78
77
|
}
|
|
79
78
|
});
|
|
@@ -83,7 +82,10 @@ function adapter(mirageServer, requestContextCreator) {
|
|
|
83
82
|
* Bind provided handlers for the OpenAPI routes
|
|
84
83
|
*/
|
|
85
84
|
function bind(opts) {
|
|
86
|
-
|
|
85
|
+
var _a;
|
|
86
|
+
opts.handler(adapter(opts.server, opts.requestContextCreator || (() => ({})), {
|
|
87
|
+
logging: (_a = opts.logging) !== null && _a !== void 0 ? _a : true
|
|
88
|
+
}))(opts.spec);
|
|
87
89
|
}
|
|
88
90
|
exports.bind = bind;
|
|
89
91
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AACA,mCAAmC;AAMnC,SAAS,gBAAgB,CAAC,iBAAqC,EAAE,KAAU;IACzE,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,QAAQ,CAAC,kBAAkB,CAAC,EAAE;QACnD,OAAO,kBAAkB,CAAC;KAC3B;IACD,IAAI,iBAAiB,EAAE;QACrB,OAAO,iBAAiB,CAAC;KAC1B;IACD,IAAI,KAAK,YAAY,QAAQ,EAAE;QAC7B,OAAO,qBAAqB,CAAC;KAC9B;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,WAAmB,EAAE,KAAU;IACvD,IAAI,KAAK,YAAY,QAAQ,EAAE;QAC7B,OAAO,MAAM,cAAc,CAAC,KAAK,CAAC,CAAC;KACpC;IACD,IAAI,WAAW,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,KAAK,EAAE;QACnD,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KAC1B;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,KAAe;IAC3C,MAAM,MAAM,GAAyC,EAAE,CAAC;IACxD,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,QAAQ,YAAY,IAAI,EAAE;YAC5B,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;SAC5C;aAAM,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YACvC,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;SACxB;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,OAAO,CACd,YAAqC,EACrC,qBAA4F;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
package/index.ts
CHANGED
|
@@ -45,8 +45,14 @@ async function handleFormData(value: FormData) {
|
|
|
45
45
|
|
|
46
46
|
function adapter<Registry extends mirageTypes.AnyRegistry, RequestContext>(
|
|
47
47
|
mirageServer: mirage.Server<Registry>,
|
|
48
|
-
requestContextCreator: (schema: Schema<Registry>, request: mirage.Request) => RequestContext
|
|
48
|
+
requestContextCreator: (schema: Schema<Registry>, request: mirage.Request) => RequestContext,
|
|
49
|
+
opts?: {
|
|
50
|
+
logging?: boolean;
|
|
51
|
+
}
|
|
49
52
|
): runtime.server.ServerAdapter {
|
|
53
|
+
// eslint-disable-next-line no-console, @typescript-eslint/no-empty-function
|
|
54
|
+
const log = opts?.logging !== false ? console.log : () => {};
|
|
55
|
+
|
|
50
56
|
return (
|
|
51
57
|
path: string,
|
|
52
58
|
op: string,
|
|
@@ -79,12 +85,10 @@ function adapter<Registry extends mirageTypes.AnyRegistry, RequestContext>(
|
|
|
79
85
|
body,
|
|
80
86
|
requestContext: requestContextCreator(schema, request)
|
|
81
87
|
};
|
|
82
|
-
|
|
83
|
-
console.log('oats-mirage-adapter request', ctx);
|
|
88
|
+
log('oats-mirage-adapter request', ctx);
|
|
84
89
|
try {
|
|
85
90
|
const result = await handler(ctx);
|
|
86
|
-
|
|
87
|
-
console.log('oats-mirage-adapter response', { result });
|
|
91
|
+
log('oats-mirage-adapter response', { result });
|
|
88
92
|
return new mirage.Response(
|
|
89
93
|
result.status,
|
|
90
94
|
{ ...result.headers, 'content-type': result.value.contentType },
|
|
@@ -93,8 +97,7 @@ function adapter<Registry extends mirageTypes.AnyRegistry, RequestContext>(
|
|
|
93
97
|
: result.value.value
|
|
94
98
|
);
|
|
95
99
|
} catch (error: any) {
|
|
96
|
-
|
|
97
|
-
console.log('oats-mirage-adapter handler threw: ' + error.message, { error });
|
|
100
|
+
log('oats-mirage-adapter handler threw: ' + error.message, { error });
|
|
98
101
|
return new mirage.Response(
|
|
99
102
|
400,
|
|
100
103
|
{ 'content-type': 'text/plain' },
|
|
@@ -118,6 +121,11 @@ export function bind<
|
|
|
118
121
|
handler: runtime.server.HandlerFactory<Spec>;
|
|
119
122
|
spec: Spec;
|
|
120
123
|
requestContextCreator?: (schema: Schema<Registry<Models, Factories>>) => RequestContext;
|
|
124
|
+
logging?: boolean;
|
|
121
125
|
}): void {
|
|
122
|
-
opts.handler(
|
|
126
|
+
opts.handler(
|
|
127
|
+
adapter(opts.server, opts.requestContextCreator || (() => ({})), {
|
|
128
|
+
logging: opts.logging ?? true
|
|
129
|
+
})
|
|
130
|
+
)(opts.spec);
|
|
123
131
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@smartlyio/oats-mirage-adapter",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.4.0",
|
|
4
4
|
"description": "Mirage.js adapter for Oats",
|
|
5
5
|
"licence": "MIT",
|
|
6
6
|
"private": false,
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"url": "https://github.com/smartlyio/oats"
|
|
21
21
|
},
|
|
22
22
|
"peerDependencies": {
|
|
23
|
-
"@smartlyio/oats-runtime": "^3.1
|
|
23
|
+
"@smartlyio/oats-runtime": "^4.3.1"
|
|
24
24
|
},
|
|
25
25
|
"keywords": [
|
|
26
26
|
"oats",
|
|
@@ -35,13 +35,13 @@
|
|
|
35
35
|
"server"
|
|
36
36
|
],
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@smartlyio/oats-runtime": "^4.
|
|
39
|
-
"@types/lodash": "4.14.
|
|
38
|
+
"@smartlyio/oats-runtime": "^4.4.0",
|
|
39
|
+
"@types/lodash": "4.14.181",
|
|
40
40
|
"@types/node": "16.11.26",
|
|
41
41
|
"miragejs": "0.1.43",
|
|
42
42
|
"nodemon": "2.0.15",
|
|
43
43
|
"ts-node": "10.7.0",
|
|
44
|
-
"typescript": "4.6.
|
|
44
|
+
"typescript": "4.6.3"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "743a31718a2487b0cf7157ac1b6bc8872af256c1"
|
|
47
47
|
}
|