@opra/common 0.31.4 → 0.31.6

package/cjs/document/data-type/complex-type-class.js

@@ -180,7 +180,7 @@ class ComplexTypeClass extends data_type_js_1.DataType {
         const omitOption = (options?.omit || []).map(x => x.toLowerCase());
         const dedupedFieldNames = (options?.overwriteFields
             ? Array.from(new Set([...this.fields.keys(), ...options?.overwriteFields.keys()]))
-            : Array.from(this.fields.keys())).map(x => x.toLocaleString());
+            : Array.from(this.fields.keys())).map(x => x.toLowerCase());
         for (const nameLower of dedupedFieldNames) {
             const overwriteField = options?.overwriteFields?.get(nameLower);
             const field = this.fields.get(nameLower);

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

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

package/cjs/document/resource/action.js

@@ -24,7 +24,9 @@ class Action extends endpoint_js_1.Endpoint {
     exportSchema(options) {
         const schema = super.exportSchema(options);
         if (this.returnType)
-            schema.returnType = this.returnType.name ? this.returnType.name : this.returnType.exportSchema(options);
+            schema.returnType = this.returnType.isAnonymous
+                ? this.returnType.exportSchema(options)
+                : this.returnType.name;
         if (this.returnMime)
             schema.returnMime = this.returnMime;
         return schema;

package/cjs/exception/resource-errors/resource-not-found.error.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResourceNotFoundError = void 0;
-const index_js_1 = require("../../i18n/index.js");
+const index_js_1 = require("../../http/index.js");
+const index_js_2 = require("../../i18n/index.js");
 const opra_exception_js_1 = require("../opra-exception.js");
 /**
  * The server cannot find the requested resource.
@@ -10,14 +11,14 @@ const opra_exception_js_1 = require("../opra-exception.js");
 class ResourceNotFoundError extends opra_exception_js_1.OpraException {
     constructor(resource, keyValue, cause) {
         super({
-            message: (0, index_js_1.translate)(`error:RESOURCE_NOT_FOUND`, `Resource not found`),
+            message: (0, index_js_2.translate)(`error:RESOURCE_NOT_FOUND`, `Resource not found`),
             severity: 'error',
             code: 'RESOURCE_NOT_FOUND',
             details: {
                 resource,
                 key: keyValue
             }
-        }, cause, 404);
+        }, cause, index_js_1.HttpStatusCodes.UNPROCESSABLE_ENTITY);
     }
 }
 exports.ResourceNotFoundError = ResourceNotFoundError;

package/esm/document/data-type/complex-type-class.js

@@ -176,7 +176,7 @@ export class ComplexTypeClass extends DataType {
         const omitOption = (options?.omit || []).map(x => x.toLowerCase());
         const dedupedFieldNames = (options?.overwriteFields
             ? Array.from(new Set([...this.fields.keys(), ...options?.overwriteFields.keys()]))
-            : Array.from(this.fields.keys())).map(x => x.toLocaleString());
+            : Array.from(this.fields.keys())).map(x => x.toLowerCase());
         for (const nameLower of dedupedFieldNames) {
             const overwriteField = options?.overwriteFields?.get(nameLower);
             const field = this.fields.get(nameLower);

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

@@ -67,19 +67,19 @@ export class ApiDocumentFactory extends TypeDocumentFactory {
             if (!source)
                 return;
             const output = {};
-            for (const [kA, oA] of Object.entries(source)) {
+            for (const [endpointName, endpointSchema] of Object.entries(source)) {
                 /* istanbul ignore next */
-                if (!oA)
+                if (!endpointSchema)
                     continue;
-                const o = output[kA] = { ...oA };
+                const outputEndpoint = output[endpointName] = { ...endpointSchema };
                 let parameters;
                 // Resolve lazy type
-                if (oA.returnType) {
-                    o.returnType = await this.importDataType(oA.returnType);
+                if (endpointSchema.returnType) {
+                    outputEndpoint.returnType = await this.importDataType(endpointSchema.returnType);
                 }
-                if (oA.parameters) {
-                    parameters = o.parameters = {};
-                    for (const [kP, oP] of Object.entries(oA.parameters)) {
+                if (endpointSchema.parameters) {
+                    parameters = outputEndpoint.parameters = {};
+                    for (const [kP, oP] of Object.entries(endpointSchema.parameters)) {
                         if (oP.enum) {
                             oP.type = EnumType(oP.enum, { name: kP + 'Enum' });
                         }
@@ -89,7 +89,6 @@ export class ApiDocumentFactory extends TypeDocumentFactory {
                         };
                     }
                 }
-                output[kA] = { ...oA[kA], parameters };
             }
             return output;
         };

package/esm/document/resource/action.js

@@ -20,7 +20,9 @@ export class Action extends Endpoint {
     exportSchema(options) {
         const schema = super.exportSchema(options);
         if (this.returnType)
-            schema.returnType = this.returnType.name ? this.returnType.name : this.returnType.exportSchema(options);
+            schema.returnType = this.returnType.isAnonymous
+                ? this.returnType.exportSchema(options)
+                : this.returnType.name;
         if (this.returnMime)
             schema.returnMime = this.returnMime;
         return schema;

package/esm/exception/resource-errors/resource-not-found.error.js

@@ -1,3 +1,4 @@
+import { HttpStatusCodes } from '../../http/index.js';
 import { translate } from '../../i18n/index.js';
 import { OpraException } from '../opra-exception.js';
 /**
@@ -14,6 +15,6 @@ export class ResourceNotFoundError extends OpraException {
                 resource,
                 key: keyValue
             }
-        }, cause, 404);
+        }, cause, HttpStatusCodes.UNPROCESSABLE_ENTITY);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "0.31.4",
+  "version": "0.31.6",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",
@@ -26,10 +26,11 @@
     "check": "madge --circular src/**",
     "test": "jest",
     "cover": "jest --collect-coverage",
-    "clean": "npm run clean:src && npm run clean:dist && npm run clean:cover",
-    "clean:src": "ts-cleanup -s src --all && ts-cleanup -s test --all",
-    "clean:dist": "rimraf ../../build/common",
-    "clean:cover": "rimraf ../../coverage/common",
+    "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",
+    "clean:dist": "rimraf ../../build/client",
+    "clean:cover": "rimraf ../../coverage/client",
     "antlr4": "java -jar ./tools/antlr4-4.12.1-SNAPSHOT-complete.jar -Dlanguage=TypeScript ./src/filter/antlr/OpraFilter.g4 -visitor"
   },
   "dependencies": {
@@ -45,7 +46,7 @@
     "putil-varhelpers": "^1.6.5",
     "reflect-metadata": "^0.1.13",
     "uid": "^2.0.1",
-    "valgen": "^4.2.2"
+    "valgen": "^4.2.3"
   },
   "devDependencies": {
     "@browsery/fs": "^0.4.0",