@opra/common 0.29.1 → 0.30.1

package/browser.js

@@ -797,6 +797,24 @@ var IssueSeverity;
   };
 })(IssueSeverity || (IssueSeverity = {}));
 
+// ../../build/common/esm/exception/http-errors/conflict.error.js
+var ConflictError = class extends OpraException {
+  static {
+    __name(this, "ConflictError");
+  }
+  constructor() {
+    super(...arguments);
+    this.status = 409;
+  }
+  init(issue) {
+    super.init({
+      message: translate("error:CONFLICT", "Conflict"),
+      code: "CONFLICT",
+      ...issue
+    });
+  }
+};
+
 // ../../build/common/esm/exception/resource-errors/resource-conflict.error.js
 var ResourceConflictError = class extends OpraException {
   static {
@@ -11149,9 +11167,13 @@ var ApiDocumentFactory = class _ApiDocumentFactory extends TypeDocumentFactory {
       for (const [kA, oA] of Object.entries(source)) {
         if (!oA)
           continue;
+        const o = output[kA] = { ...oA };
         let parameters;
+        if (oA.returnType) {
+          o.returnType = await this.importDataType(oA.returnType);
+        }
         if (oA.parameters) {
-          parameters = {};
+          parameters = o.parameters = {};
           for (const [kP, oP] of Object.entries(oA.parameters)) {
             if (oP.enum) {
               oP.type = EnumType2(oP.enum, { name: kP + "Enum" });
@@ -11233,6 +11255,9 @@ var ApiDocumentFactory = class _ApiDocumentFactory extends TypeDocumentFactory {
       const output = {};
       for (const [kA, oA] of Object.entries(source)) {
         const o = output[kA] = { ...oA };
+        if (oA.returnType) {
+          o.returnType = await this.importDataType(oA.returnType);
+        }
         if (oA.parameters) {
           const parameters = o.parameters = {};
           for (const [kP, oP] of Object.entries(oA.parameters)) {
@@ -11387,8 +11412,14 @@ var OpraURLPath = class _OpraURLPath {
   }
   _resolve(items, join) {
     let paths = (Array.isArray(items) ? items : [items]).map((item) => {
-      if (typeof item === "object" && !(item instanceof _OpraURLPath || item instanceof OpraURLPathComponent))
+      if (typeof item === "object" && !(item instanceof _OpraURLPath || item instanceof OpraURLPathComponent)) {
         item = new OpraURLPathComponent(item);
+        if (item.resource.includes("/")) {
+          const subPath = new _OpraURLPath(item.resource);
+          subPath[subPath.length - 1].key = item.key;
+          return String(subPath);
+        }
+      }
       item = String(item);
       if (item.includes("?"))
         item = splitString2(item, {
@@ -12036,6 +12067,7 @@ export {
   BaseI18n,
   Collection2 as Collection,
   ComplexType2 as ComplexType,
+  ConflictError,
   Container2 as Container,
   CrudOperation,
   CrudResource,

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

@@ -74,9 +74,14 @@ class ApiDocumentFactory extends type_document_factory_js_1.TypeDocumentFactory
                 /* istanbul ignore next */
                 if (!oA)
                     continue;
+                const o = output[kA] = { ...oA };
                 let parameters;
+                // Resolve lazy type
+                if (oA.returnType) {
+                    o.returnType = await this.importDataType(oA.returnType);
+                }
                 if (oA.parameters) {
-                    parameters = {};
+                    parameters = o.parameters = {};
                     for (const [kP, oP] of Object.entries(oA.parameters)) {
                         if (oP.enum) {
                             oP.type = (0, enum_type_js_1.EnumType)(oP.enum, { name: kP + 'Enum' });
@@ -163,6 +168,10 @@ class ApiDocumentFactory extends type_document_factory_js_1.TypeDocumentFactory
             const output = {};
             for (const [kA, oA] of Object.entries(source)) {
                 const o = output[kA] = { ...oA };
+                // Resolve lazy type
+                if (oA.returnType) {
+                    o.returnType = await this.importDataType(oA.returnType);
+                }
                 if (oA.parameters) {
                     const parameters = o.parameters = {};
                     for (const [kP, oP] of Object.entries(oA.parameters)) {

package/cjs/exception/http-errors/conflict.error.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConflictError = void 0;
+const index_js_1 = require("../../i18n/index.js");
+const opra_exception_js_1 = require("../opra-exception.js");
+/**
+ * 409 Conflict
+ * This response is sent when a request conflicts with the current state of the server.
+ */
+class ConflictError extends opra_exception_js_1.OpraException {
+    constructor() {
+        super(...arguments);
+        this.status = 409;
+    }
+    init(issue) {
+        super.init({
+            message: (0, index_js_1.translate)('error:CONFLICT', 'Conflict'),
+            code: 'CONFLICT',
+            ...issue
+        });
+    }
+}
+exports.ConflictError = ConflictError;

package/cjs/exception/index.js

@@ -6,6 +6,7 @@ tslib_1.__exportStar(require("./error-issue.js"), exports);
 tslib_1.__exportStar(require("./wrap-exception.js"), exports);
 tslib_1.__exportStar(require("./issue-severity.enum.js"), exports);
 tslib_1.__exportStar(require("./http-errors/bad-request.error.js"), exports);
+tslib_1.__exportStar(require("./http-errors/conflict.error.js"), exports);
 tslib_1.__exportStar(require("./http-errors/failed-dependency.error.js"), exports);
 tslib_1.__exportStar(require("./http-errors/forbidden.error.js"), exports);
 tslib_1.__exportStar(require("./http-errors/internal-server.error.js"), exports);

package/cjs/http/opra-url-path.js

@@ -66,8 +66,14 @@ class OpraURLPath {
     }
     _resolve(items, join) {
         let paths = (Array.isArray(items) ? items : [items]).map(item => {
-            if (typeof item === 'object' && !(item instanceof OpraURLPath || item instanceof OpraURLPathComponent))
+            if (typeof item === 'object' && !(item instanceof OpraURLPath || item instanceof OpraURLPathComponent)) {
                 item = new OpraURLPathComponent(item);
+                if (item.resource.includes('/')) {
+                    const subPath = new OpraURLPath(item.resource);
+                    subPath[subPath.length - 1].key = item.key;
+                    return String(subPath);
+                }
+            }
             item = String(item);
             // Remove url parts coming after path (query, hash parts)
             if (item.includes('?'))

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

@@ -71,9 +71,14 @@ export class ApiDocumentFactory extends TypeDocumentFactory {
                 /* istanbul ignore next */
                 if (!oA)
                     continue;
+                const o = output[kA] = { ...oA };
                 let parameters;
+                // Resolve lazy type
+                if (oA.returnType) {
+                    o.returnType = await this.importDataType(oA.returnType);
+                }
                 if (oA.parameters) {
-                    parameters = {};
+                    parameters = o.parameters = {};
                     for (const [kP, oP] of Object.entries(oA.parameters)) {
                         if (oP.enum) {
                             oP.type = EnumType(oP.enum, { name: kP + 'Enum' });
@@ -160,6 +165,10 @@ export class ApiDocumentFactory extends TypeDocumentFactory {
             const output = {};
             for (const [kA, oA] of Object.entries(source)) {
                 const o = output[kA] = { ...oA };
+                // Resolve lazy type
+                if (oA.returnType) {
+                    o.returnType = await this.importDataType(oA.returnType);
+                }
                 if (oA.parameters) {
                     const parameters = o.parameters = {};
                     for (const [kP, oP] of Object.entries(oA.parameters)) {

package/esm/exception/http-errors/conflict.error.js

@@ -0,0 +1,19 @@
+import { translate } from '../../i18n/index.js';
+import { OpraException } from '../opra-exception.js';
+/**
+ * 409 Conflict
+ * This response is sent when a request conflicts with the current state of the server.
+ */
+export class ConflictError extends OpraException {
+    constructor() {
+        super(...arguments);
+        this.status = 409;
+    }
+    init(issue) {
+        super.init({
+            message: translate('error:CONFLICT', 'Conflict'),
+            code: 'CONFLICT',
+            ...issue
+        });
+    }
+}

package/esm/exception/index.js

@@ -3,6 +3,7 @@ export * from './error-issue.js';
 export * from './wrap-exception.js';
 export * from './issue-severity.enum.js';
 export * from './http-errors/bad-request.error.js';
+export * from './http-errors/conflict.error.js';
 export * from './http-errors/failed-dependency.error.js';
 export * from './http-errors/forbidden.error.js';
 export * from './http-errors/internal-server.error.js';

package/esm/http/opra-url-path.js

@@ -62,8 +62,14 @@ export class OpraURLPath {
     }
     _resolve(items, join) {
         let paths = (Array.isArray(items) ? items : [items]).map(item => {
-            if (typeof item === 'object' && !(item instanceof OpraURLPath || item instanceof OpraURLPathComponent))
+            if (typeof item === 'object' && !(item instanceof OpraURLPath || item instanceof OpraURLPathComponent)) {
                 item = new OpraURLPathComponent(item);
+                if (item.resource.includes('/')) {
+                    const subPath = new OpraURLPath(item.resource);
+                    subPath[subPath.length - 1].key = item.key;
+                    return String(subPath);
+                }
+            }
             item = String(item);
             // Remove url parts coming after path (query, hash parts)
             if (item.includes('?'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "0.29.1",
+  "version": "0.30.1",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",
@@ -45,7 +45,7 @@
     "putil-varhelpers": "^1.6.5",
     "reflect-metadata": "^0.1.13",
     "uid": "^2.0.1",
-    "valgen": "^4.0.1"
+    "valgen": "^4.1.0"
   },
   "devDependencies": {
     "@browsery/fs": "^0.4.0",

package/types/document/factory/api-document-factory.d.ts

@@ -16,7 +16,6 @@ export declare namespace ApiDocumentFactory {
     interface InitArguments extends TypeDocumentFactory.InitArguments {
         root?: RootInit;
     }
-    type DataTypeInitializer = TypeDocumentFactory.DataTypeInitializer;
     type ResourceInitializer = (Collection.InitArguments & {
         kind: OpraSchema.Collection.Kind;
     }) | (Singleton.InitArguments & {

package/types/document/resource/collection.d.ts

@@ -27,20 +27,36 @@ export declare namespace Collection {
     interface DecoratorOptions<T = any> extends Partial<StrictOmit<CollectionDecorator.Metadata, 'kind' | 'operations' | 'actions' | 'primaryKey'>> {
         primaryKey?: keyof T | (keyof T)[];
     }
+    interface Action {
+    }
     namespace Action {
     }
+    interface Create {
+    }
     namespace Create {
     }
+    interface Delete {
+    }
     namespace Delete {
     }
+    interface DeleteMany {
+    }
     namespace DeleteMany {
     }
+    interface FindMany {
+    }
     namespace FindMany {
     }
+    interface Get {
+    }
     namespace Get {
     }
+    interface Update {
+    }
     namespace Update {
     }
+    interface UpdateMany {
+    }
     namespace UpdateMany {
     }
 }

package/types/document/resource/container.d.ts

@@ -20,6 +20,8 @@ export declare namespace Container {
     }
     interface DecoratorOptions extends Partial<StrictOmit<ContainerDecorator.Metadata, 'kind' | 'actions'>> {
     }
+    interface Action {
+    }
     namespace Action {
     }
 }

package/types/document/resource/singleton.d.ts

@@ -26,14 +26,24 @@ export declare namespace Singleton {
     }
     interface DecoratorOptions extends Partial<StrictOmit<SingletonDecorator.Metadata, 'kind' | 'operations' | 'actions'>> {
     }
+    interface Action {
+    }
     namespace Action {
     }
+    interface Create {
+    }
     namespace Create {
     }
+    interface Delete {
+    }
     namespace Delete {
     }
+    interface Get {
+    }
     namespace Get {
     }
+    interface Update {
+    }
     namespace Update {
     }
 }

package/types/document/resource/storage.d.ts

@@ -20,12 +20,20 @@ export declare namespace Storage {
     }
     interface DecoratorOptions extends Partial<StrictOmit<StorageDecorator.Metadata, 'kind' | 'operations' | 'actions'>> {
     }
+    interface Action {
+    }
     namespace Action {
     }
+    interface Delete {
+    }
     namespace Delete {
     }
+    interface Get {
+    }
     namespace Get {
     }
+    interface Post {
+    }
     namespace Post {
     }
 }

package/types/exception/http-errors/conflict.error.d.ts

@@ -0,0 +1,10 @@
+import { ErrorIssue } from '../error-issue.js';
+import { OpraException } from '../opra-exception.js';
+/**
+ * 409 Conflict
+ * This response is sent when a request conflicts with the current state of the server.
+ */
+export declare class ConflictError extends OpraException {
+    status: number;
+    protected init(issue: Partial<ErrorIssue>): void;
+}

package/types/exception/index.d.ts

@@ -3,6 +3,7 @@ export * from './error-issue.js';
 export * from './wrap-exception.js';
 export * from './issue-severity.enum.js';
 export * from './http-errors/bad-request.error.js';
+export * from './http-errors/conflict.error.js';
 export * from './http-errors/failed-dependency.error.js';
 export * from './http-errors/forbidden.error.js';
 export * from './http-errors/internal-server.error.js';