@opra/common 1.0.0-alpha.5 → 1.0.0-alpha.7

package/browser.js

@@ -2525,14 +2525,25 @@ var HttpControllerClass = class extends DocumentElement {
     return this.controllers.get(arg0);
   }
   findParameter(paramName, location) {
-    paramName = paramName.toLowerCase();
-    for (const prm of this.parameters) {
-      if ((!location || location === prm.location) && (prm.name instanceof RegExp && prm.name.test(paramName) || typeof prm.name === "string" && prm.name.toLowerCase() === paramName))
+    const paramNameLower = paramName.toLowerCase();
+    let prm;
+    for (prm of this.parameters) {
+      if (location && location !== prm.location)
+        continue;
+      if (typeof prm.name === "string") {
+        prm._nameLower = prm._nameLower || prm.name.toLowerCase();
+        if (prm._nameLower === paramNameLower)
+          return prm;
+      }
+      if (prm.name instanceof RegExp && prm.name.test(paramName))
         return prm;
     }
     if (this.node.parent && this.node.parent.element instanceof HttpController2)
       return this.node.parent.element.findParameter(paramName, location);
   }
+  getFullUrl() {
+    return (this.owner instanceof HttpController2 ? this.owner.getFullUrl() : "/") + this.path;
+  }
   /**
    *
    */
@@ -2726,6 +2737,7 @@ var HttpMultipartField = class extends HttpMediaType {
 };
 
 // ../../build/common/esm/document/http/http-operation.js
+import nodePath from "node:path";
 import { asMutable as asMutable12 } from "ts-gems";
 
 // ../../build/common/esm/document/decorators/http-operation.decorator.js
@@ -3140,12 +3152,24 @@ var HttpOperationClass = class extends DocumentElement {
     __name(this, "HttpOperationClass");
   }
   findParameter(paramName, location) {
-    paramName = paramName.toLowerCase();
-    for (const prm of this.parameters) {
-      if ((!location || location === prm.location) && (prm.name instanceof RegExp && prm.name.test(paramName) || prm.name === paramName))
+    const paramNameLower = paramName.toLowerCase();
+    let prm;
+    for (prm of this.parameters) {
+      if (location && location !== prm.location)
+        continue;
+      if (typeof prm.name === "string") {
+        prm._nameLower = prm._nameLower || prm.name.toLowerCase();
+        if (prm._nameLower === paramNameLower)
+          return prm;
+      }
+      if (prm.name instanceof RegExp && prm.name.test(paramName))
         return prm;
     }
   }
+  getFullUrl() {
+    const out = this.owner.getFullUrl();
+    return out ? this.path ? nodePath.posix.join(out, this.path) : out : this.path || "/";
+  }
   toJSON() {
     const out = omitUndefined({
       kind: OpraSchema.HttpOperation.Kind,
@@ -3368,6 +3392,7 @@ var HttpApiFactory = class {
    */
   static async createApi(context, document, init) {
     const api = new HttpApi(document);
+    api.name = init.name;
     api.description = init.description;
     api.url = init.url;
     if (init.controllers) {

package/cjs/document/factory/http-api.factory.js

@@ -24,6 +24,7 @@ class HttpApiFactory {
      */
     static async createApi(context, document, init) {
         const api = new http_api_js_1.HttpApi(document);
+        api.name = init.name;
         api.description = init.description;
         api.url = init.url;
         if (init.controllers) {

package/cjs/document/http/http-controller.js

@@ -82,16 +82,25 @@ class HttpControllerClass extends document_element_js_1.DocumentElement {
         return this.controllers.get(arg0);
     }
     findParameter(paramName, location) {
-        paramName = paramName.toLowerCase();
-        for (const prm of this.parameters) {
-            if ((!location || location === prm.location) &&
-                ((prm.name instanceof RegExp && prm.name.test(paramName)) ||
-                    (typeof prm.name === 'string' && prm.name.toLowerCase() === paramName)))
+        const paramNameLower = paramName.toLowerCase();
+        let prm;
+        for (prm of this.parameters) {
+            if (location && location !== prm.location)
+                continue;
+            if (typeof prm.name === 'string') {
+                prm._nameLower = prm._nameLower || prm.name.toLowerCase();
+                if (prm._nameLower === paramNameLower)
+                    return prm;
+            }
+            if (prm.name instanceof RegExp && prm.name.test(paramName))
                 return prm;
         }
         if (this.node.parent && this.node.parent.element instanceof exports.HttpController)
             return this.node.parent.element.findParameter(paramName, location);
     }
+    getFullUrl() {
+        return (this.owner instanceof exports.HttpController ? this.owner.getFullUrl() : '/') + this.path;
+    }
     /**
      *
      */

package/cjs/document/http/http-operation.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpOperation = void 0;
+const tslib_1 = require("tslib");
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const ts_gems_1 = require("ts-gems");
 const index_js_1 = require("../../helpers/index.js");
 const index_js_2 = require("../../schema/index.js");
@@ -39,13 +41,24 @@ exports.HttpOperation = function (...args) {
  */
 class HttpOperationClass extends document_element_js_1.DocumentElement {
     findParameter(paramName, location) {
-        paramName = paramName.toLowerCase();
-        for (const prm of this.parameters) {
-            if ((!location || location === prm.location) &&
-                ((prm.name instanceof RegExp && prm.name.test(paramName)) || prm.name === paramName))
+        const paramNameLower = paramName.toLowerCase();
+        let prm;
+        for (prm of this.parameters) {
+            if (location && location !== prm.location)
+                continue;
+            if (typeof prm.name === 'string') {
+                prm._nameLower = prm._nameLower || prm.name.toLowerCase();
+                if (prm._nameLower === paramNameLower)
+                    return prm;
+            }
+            if (prm.name instanceof RegExp && prm.name.test(paramName))
                 return prm;
         }
     }
+    getFullUrl() {
+        const out = this.owner.getFullUrl();
+        return out ? (this.path ? node_path_1.default.posix.join(out, this.path) : out) : this.path || '/';
+    }
     toJSON() {
         const out = (0, index_js_1.omitUndefined)({
             kind: index_js_2.OpraSchema.HttpOperation.Kind,

package/esm/document/factory/http-api.factory.js

@@ -21,6 +21,7 @@ export class HttpApiFactory {
      */
     static async createApi(context, document, init) {
         const api = new HttpApi(document);
+        api.name = init.name;
         api.description = init.description;
         api.url = init.url;
         if (init.controllers) {

package/esm/document/http/http-controller.js

@@ -79,16 +79,25 @@ class HttpControllerClass extends DocumentElement {
         return this.controllers.get(arg0);
     }
     findParameter(paramName, location) {
-        paramName = paramName.toLowerCase();
-        for (const prm of this.parameters) {
-            if ((!location || location === prm.location) &&
-                ((prm.name instanceof RegExp && prm.name.test(paramName)) ||
-                    (typeof prm.name === 'string' && prm.name.toLowerCase() === paramName)))
+        const paramNameLower = paramName.toLowerCase();
+        let prm;
+        for (prm of this.parameters) {
+            if (location && location !== prm.location)
+                continue;
+            if (typeof prm.name === 'string') {
+                prm._nameLower = prm._nameLower || prm.name.toLowerCase();
+                if (prm._nameLower === paramNameLower)
+                    return prm;
+            }
+            if (prm.name instanceof RegExp && prm.name.test(paramName))
                 return prm;
         }
         if (this.node.parent && this.node.parent.element instanceof HttpController)
             return this.node.parent.element.findParameter(paramName, location);
     }
+    getFullUrl() {
+        return (this.owner instanceof HttpController ? this.owner.getFullUrl() : '/') + this.path;
+    }
     /**
      *
      */

package/esm/document/http/http-operation.js

@@ -1,3 +1,4 @@
+import nodePath from 'node:path';
 import { asMutable } from 'ts-gems';
 import { cloneObject, omitUndefined } from '../../helpers/index.js';
 import { OpraSchema } from '../../schema/index.js';
@@ -36,13 +37,24 @@ export const HttpOperation = function (...args) {
  */
 class HttpOperationClass extends DocumentElement {
     findParameter(paramName, location) {
-        paramName = paramName.toLowerCase();
-        for (const prm of this.parameters) {
-            if ((!location || location === prm.location) &&
-                ((prm.name instanceof RegExp && prm.name.test(paramName)) || prm.name === paramName))
+        const paramNameLower = paramName.toLowerCase();
+        let prm;
+        for (prm of this.parameters) {
+            if (location && location !== prm.location)
+                continue;
+            if (typeof prm.name === 'string') {
+                prm._nameLower = prm._nameLower || prm.name.toLowerCase();
+                if (prm._nameLower === paramNameLower)
+                    return prm;
+            }
+            if (prm.name instanceof RegExp && prm.name.test(paramName))
                 return prm;
         }
     }
+    getFullUrl() {
+        const out = this.owner.getFullUrl();
+        return out ? (this.path ? nodePath.posix.join(out, this.path) : out) : this.path || '/';
+    }
     toJSON() {
         const out = omitUndefined({
             kind: OpraSchema.HttpOperation.Kind,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.7",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",

package/types/document/http/http-controller.d.ts

@@ -76,6 +76,7 @@ declare class HttpControllerClass extends DocumentElement {
     findController(controller: Type): HttpController | undefined;
     findController(resourcePath: string): HttpController | undefined;
     findParameter(paramName: string, location?: OpraSchema.HttpParameterLocation): HttpParameter | undefined;
+    getFullUrl(): string;
     /**
      *
      */

package/types/document/http/http-operation.d.ts

@@ -79,6 +79,7 @@ declare class HttpOperationClass extends DocumentElement {
     composition?: string;
     compositionOptions?: Record<string, any>;
     findParameter(paramName: string, location?: OpraSchema.HttpParameterLocation): HttpParameter | undefined;
+    getFullUrl(): string;
     toJSON(): OpraSchema.HttpOperation;
 }
 export {};

package/types/document/http/http-parameter.d.ts

@@ -1,6 +1,5 @@
 import { Combine, StrictOmit, TypeThunkAsync } from 'ts-gems';
 import type { OpraSchema } from '../../schema/index.js';
-import { HttpParameterLocation } from '../../schema/types.js';
 import { DocumentElement } from '../common/document-element.js';
 import { Value } from '../common/value.js';
 import { DataType } from '../data-type/data-type.js';
@@ -46,7 +45,7 @@ declare class HttpParameterClass extends Value {
     deprecated?: boolean | string;
     required?: boolean;
     arraySeparator?: string;
-    location: HttpParameterLocation;
+    location: OpraSchema.HttpParameterLocation;
     toJSON(): OpraSchema.HttpParameter;
 }
 export {};