@opra/core 1.0.0-alpha.2 → 1.0.0-alpha.4

package/cjs/execution-context.js

@@ -11,7 +11,6 @@ class ExecutionContext extends strict_typed_events_1.AsyncEventEmitter {
         this.document = init.document;
         this.protocol = init.protocol;
         this.platform = init.platform;
-        this.platformArgs = init.platformArgs;
     }
     addListener(event, listener) {
         return super.addListener(event, listener);

package/cjs/http/express-adapter.js

@@ -65,14 +65,9 @@ class ExpressAdapter extends http_adapter_js_1.HttpAdapter {
         const createContext = (_req, _res, args) => {
             const request = http_incoming_interface_js_1.HttpIncoming.from(_req);
             const response = http_outgoing_interface_js_1.HttpOutgoing.from(_res);
-            const platformArgs = {
-                request: _req,
-                response: _res,
-            };
             return new http_context_js_1.HttpContext({
                 adapter: this,
                 platform: this.platform,
-                platformArgs,
                 request,
                 response,
                 controller: args?.controller,

package/cjs/http/impl/http-handler.js

@@ -482,28 +482,23 @@ class HttpHandler {
         const { request, response } = context;
         const { document } = this.adapter;
         response.setHeader('content-type', common_1.MimeTypes.json);
+        const url = new URL(request.originalUrl || request.url || '/', 'http://tempuri.org');
+        const { searchParams } = url;
+        const documentId = searchParams.get('id');
+        const doc = documentId ? document.findDocument(documentId) : document;
+        if (!doc)
+            return this.sendErrorResponse(response, [
+                new common_1.BadRequestError({
+                    message: `Document with given id [${documentId}] does not exists`,
+                }),
+            ]);
         /** Check if response cache exists */
-        let responseBody = this[constants_js_1.kAssetCache].get(document, '$schema-response');
+        let responseBody = this[constants_js_1.kAssetCache].get(doc, `$schema`);
         /** Create response if response cache does not exists */
         if (!responseBody) {
-            const url = new URL(request.originalUrl || request.url || '/', 'http://tempuri.org');
-            const { searchParams } = url;
-            // const nsPath = searchParams.get('ns');
-            // if (nsPath) {
-            //   const arr = nsPath.split('/');
-            //   let doc = document;
-            //   for (const a of arr) {
-            //   }
-            // }
-            const schema = document.export({ references: searchParams.get('references') });
-            const dt = document.node.getComplexType('OperationResult');
-            let encode = this[constants_js_1.kAssetCache].get(dt, 'encode');
-            if (!encode) {
-                encode = dt.generateCodec('encode');
-                this[constants_js_1.kAssetCache].set(dt, 'encode', encode);
-            }
+            const schema = doc.export();
             responseBody = JSON.stringify(schema);
-            this[constants_js_1.kAssetCache].set(document, '$schema-response', responseBody);
+            this[constants_js_1.kAssetCache].set(doc, `$schema`, responseBody);
         }
         response.end(responseBody);
     }

package/esm/execution-context.js

@@ -8,7 +8,6 @@ export class ExecutionContext extends AsyncEventEmitter {
         this.document = init.document;
         this.protocol = init.protocol;
         this.platform = init.platform;
-        this.platformArgs = init.platformArgs;
     }
     addListener(event, listener) {
         return super.addListener(event, listener);

package/esm/http/express-adapter.js

@@ -61,14 +61,9 @@ export class ExpressAdapter extends HttpAdapter {
         const createContext = (_req, _res, args) => {
             const request = HttpIncoming.from(_req);
             const response = HttpOutgoing.from(_res);
-            const platformArgs = {
-                request: _req,
-                response: _res,
-            };
             return new HttpContext({
                 adapter: this,
                 platform: this.platform,
-                platformArgs,
                 request,
                 response,
                 controller: args?.controller,

package/esm/http/impl/http-handler.js

@@ -478,28 +478,23 @@ export class HttpHandler {
         const { request, response } = context;
         const { document } = this.adapter;
         response.setHeader('content-type', MimeTypes.json);
+        const url = new URL(request.originalUrl || request.url || '/', 'http://tempuri.org');
+        const { searchParams } = url;
+        const documentId = searchParams.get('id');
+        const doc = documentId ? document.findDocument(documentId) : document;
+        if (!doc)
+            return this.sendErrorResponse(response, [
+                new BadRequestError({
+                    message: `Document with given id [${documentId}] does not exists`,
+                }),
+            ]);
         /** Check if response cache exists */
-        let responseBody = this[kAssetCache].get(document, '$schema-response');
+        let responseBody = this[kAssetCache].get(doc, `$schema`);
         /** Create response if response cache does not exists */
         if (!responseBody) {
-            const url = new URL(request.originalUrl || request.url || '/', 'http://tempuri.org');
-            const { searchParams } = url;
-            // const nsPath = searchParams.get('ns');
-            // if (nsPath) {
-            //   const arr = nsPath.split('/');
-            //   let doc = document;
-            //   for (const a of arr) {
-            //   }
-            // }
-            const schema = document.export({ references: searchParams.get('references') });
-            const dt = document.node.getComplexType('OperationResult');
-            let encode = this[kAssetCache].get(dt, 'encode');
-            if (!encode) {
-                encode = dt.generateCodec('encode');
-                this[kAssetCache].set(dt, 'encode', encode);
-            }
+            const schema = doc.export();
             responseBody = JSON.stringify(schema);
-            this[kAssetCache].set(document, '$schema-response', responseBody);
+            this[kAssetCache].set(doc, `$schema`, responseBody);
         }
         response.end(responseBody);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.4",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -21,8 +21,8 @@
     "lint": "eslint . --max-warnings=0",
     "check": "madge --circular src/**",
     "format": "prettier . --write --log-level=warn",
-    "test": "jest",
-    "cover": "jest --collect-coverage",
+    "test": "jest --passWithNoTests",
+    "cover": "jest --passWithNoTests --collect-coverage",
     "clean": "npm run clean:src && npm run clean:test && npm run clean:dist && npm run clean:cover",
     "clean:src": "ts-cleanup -s src --all",
     "clean:test": "ts-cleanup -s test --all",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@browsery/type-is": "^1.6.18-r2",
-    "@opra/common": "^1.0.0-alpha.2",
+    "@opra/common": "^1.0.0-alpha.4",
     "@types/formidable": "^3.4.5",
     "accepts": "^1.3.8",
     "base64-stream": "^1.0.0",
@@ -76,7 +76,7 @@
     "cookie-parser": "^1.4.6",
     "crypto-browserify": "^3.12.0",
     "express": "^4.19.2",
-    "fastify": "^4.27.0",
+    "fastify": "^4.28.0",
     "path-browserify": "^1.0.1",
     "ts-gems": "^3.4.0"
   },

package/types/execution-context.d.ts

@@ -8,7 +8,6 @@ export declare namespace ExecutionContext {
         document: ApiDocument;
         protocol: OpraSchema.Protocol;
         platform: string;
-        platformArgs: any;
     }
     type OnFinishListener = (error: Error | undefined, context: ExecutionContext) => void | Promise<void>;
 }
@@ -19,7 +18,6 @@ export declare abstract class ExecutionContext extends AsyncEventEmitter {
     readonly document: ApiDocument;
     readonly protocol: OpraSchema.Protocol;
     readonly platform: string;
-    readonly platformArgs: any;
     protected constructor(init: ExecutionContext.Initiator);
     addListener(event: 'finish', listener: ExecutionContext.OnFinishListener): this;
     removeListener(event: 'finish', listener: ExecutionContext.OnFinishListener): this;