@opra/core 0.27.0 → 0.28.0

package/cjs/augmentation/18n.augmentation.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const common_1 = require("@opra/common");
+common_1.I18n.prototype.loadResourceBundle = async function (lang, ns, filePath, deep, overwrite) {
+    let obj;
+    if ((0, common_1.isUrlString)(filePath)) {
+        obj = (await fetch(filePath, { headers: { accept: 'application/json' } })).json();
+    }
+    else {
+        const content = fs_1.default.readFileSync(filePath, 'utf8');
+        obj = JSON.parse(content);
+    }
+    this.addResourceBundle(lang, ns, obj, deep, overwrite);
+};
+common_1.I18n.prototype.loadResourceDir = async function (dirnames, deep, overwrite) {
+    for (const dirname of Array.isArray(dirnames) ? dirnames : [dirnames]) {
+        /* istanbul ignore next */
+        if (!(fs_1.default.existsSync(dirname)))
+            continue;
+        const languageDirs = fs_1.default.readdirSync(dirname);
+        for (const lang of languageDirs) {
+            const langDir = path_1.default.join(dirname, lang);
+            if ((fs_1.default.statSync(langDir)).isDirectory()) {
+                const nsDirs = fs_1.default.readdirSync(langDir);
+                for (const nsfile of nsDirs) {
+                    const nsFilePath = path_1.default.join(langDir, nsfile);
+                    const ext = path_1.default.extname(nsfile);
+                    if (ext === '.json' && (fs_1.default.statSync(nsFilePath)).isFile()) {
+                        const ns = path_1.default.basename(nsfile, ext);
+                        await this.loadResourceBundle(lang, ns, nsFilePath, deep, overwrite);
+                    }
+                }
+            }
+        }
+    }
+};

package/cjs/http/http-adapter-host.js

@@ -4,8 +4,8 @@ exports.HttpAdapterHost = void 0;
 const tslib_1 = require("tslib");
 const promises_1 = tslib_1.__importDefault(require("fs/promises"));
 const os_1 = tslib_1.__importDefault(require("os"));
-const type_is_1 = tslib_1.__importDefault(require("type-is"));
 const vg = tslib_1.__importStar(require("valgen"));
+const type_is_1 = tslib_1.__importDefault(require("@browsery/type-is"));
 const common_1 = require("@opra/common");
 const execution_context_host_js_1 = require("../execution-context.host.js");
 const platform_adapter_host_js_1 = require("../platform-adapter.host.js");
@@ -90,7 +90,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 throw e;
             if (e instanceof vg.ValidationError) {
                 throw new common_1.BadRequestError({
-                    message: (0, common_1.translate)('error:RESPONSE_VALIDATION,', 'Response validation failed'),
+                    message: (0, common_1.translate)('error:RESPONSE_VALIDATION,'),
                     code: 'RESPONSE_VALIDATION',
                     details: e.issues
                 }, e);
@@ -109,7 +109,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 throw e;
             if (e instanceof vg.ValidationError) {
                 throw new common_1.InternalServerError({
-                    message: (0, common_1.translate)('error:RESPONSE_VALIDATION,', 'Response validation failed'),
+                    message: (0, common_1.translate)('error:RESPONSE_VALIDATION,'),
                     code: 'RESPONSE_VALIDATION',
                     details: e.issues
                 }, e);

package/cjs/http/http-server-request.js

@@ -9,7 +9,7 @@ const tslib_1 = require("tslib");
 const accepts_1 = tslib_1.__importDefault(require("accepts"));
 const fresh_1 = tslib_1.__importDefault(require("fresh"));
 const range_parser_1 = tslib_1.__importDefault(require("range-parser"));
-const type_is_1 = tslib_1.__importDefault(require("type-is"));
+const type_is_1 = tslib_1.__importDefault(require("@browsery/type-is"));
 const common_1 = require("@opra/common");
 const http_incoming_message_host_js_1 = require("./impl/http-incoming-message.host.js");
 function isHttpIncomingMessage(v) {

package/cjs/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 require("reflect-metadata");
+require("./augmentation/18n.augmentation.js");
 require("./augmentation/resource.augmentation.js");
 require("./augmentation/collection.augmentation.js");
 require("./augmentation/container.augmentation.js");

package/cjs/platform-adapter.host.js

@@ -114,7 +114,7 @@ class PlatformAdapterHost extends strict_typed_events_1.AsyncEventEmitter {
                 return { controller, endpoint, handler };
         }
         throw new common_1.BadRequestError({
-            message: (0, common_1.translate)('ACTION_NOT_FOUND', { resource: resource.name, action: name }, `The {{resource}} resource doesn't have an action named '{{action}}'`),
+            message: (0, common_1.translate)('error:ACTION_NOT_FOUND', { resource: resource.name, action: name }),
             severity: 'error',
             code: 'ACTION_NOT_FOUND'
         });
@@ -131,7 +131,7 @@ class PlatformAdapterHost extends strict_typed_events_1.AsyncEventEmitter {
                 return { controller, endpoint, handler };
         }
         throw new common_1.ForbiddenError({
-            message: (0, common_1.translate)('OPERATION_FORBIDDEN', { resource: resource.name, operation: name }, `'The {{resource}} resource does not accept '{{operation}}' operations`),
+            message: (0, common_1.translate)('error:OPERATION_FORBIDDEN', { resource: resource.name, operation: name }),
             severity: 'error',
             code: 'OPERATION_FORBIDDEN'
         });

package/esm/augmentation/18n.augmentation.js

@@ -0,0 +1,36 @@
+import fs from 'fs';
+import path from 'path';
+import { I18n, isUrlString } from '@opra/common';
+I18n.prototype.loadResourceBundle = async function (lang, ns, filePath, deep, overwrite) {
+    let obj;
+    if (isUrlString(filePath)) {
+        obj = (await fetch(filePath, { headers: { accept: 'application/json' } })).json();
+    }
+    else {
+        const content = fs.readFileSync(filePath, 'utf8');
+        obj = JSON.parse(content);
+    }
+    this.addResourceBundle(lang, ns, obj, deep, overwrite);
+};
+I18n.prototype.loadResourceDir = async function (dirnames, deep, overwrite) {
+    for (const dirname of Array.isArray(dirnames) ? dirnames : [dirnames]) {
+        /* istanbul ignore next */
+        if (!(fs.existsSync(dirname)))
+            continue;
+        const languageDirs = fs.readdirSync(dirname);
+        for (const lang of languageDirs) {
+            const langDir = path.join(dirname, lang);
+            if ((fs.statSync(langDir)).isDirectory()) {
+                const nsDirs = fs.readdirSync(langDir);
+                for (const nsfile of nsDirs) {
+                    const nsFilePath = path.join(langDir, nsfile);
+                    const ext = path.extname(nsfile);
+                    if (ext === '.json' && (fs.statSync(nsFilePath)).isFile()) {
+                        const ns = path.basename(nsfile, ext);
+                        await this.loadResourceBundle(lang, ns, nsFilePath, deep, overwrite);
+                    }
+                }
+            }
+        }
+    }
+};

package/esm/http/http-adapter-host.js

@@ -1,7 +1,7 @@
 import fs from 'fs/promises';
 import os from 'os';
-import typeIs from 'type-is';
 import * as vg from 'valgen';
+import typeIs from '@browsery/type-is';
 import { BadRequestError, Collection, Container, HttpHeaderCodes, HttpStatusCodes, InternalServerError, isReadable, IssueSeverity, MethodNotAllowedError, OperationResult, OpraException, OpraSchema, OpraURL, ResourceNotFoundError, Singleton, Storage, translate, uid, wrapException } from '@opra/common';
 import { ExecutionContextHost } from '../execution-context.host.js';
 import { PlatformAdapterHost } from '../platform-adapter.host.js';
@@ -86,7 +86,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 throw e;
             if (e instanceof vg.ValidationError) {
                 throw new BadRequestError({
-                    message: translate('error:RESPONSE_VALIDATION,', 'Response validation failed'),
+                    message: translate('error:RESPONSE_VALIDATION,'),
                     code: 'RESPONSE_VALIDATION',
                     details: e.issues
                 }, e);
@@ -105,7 +105,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 throw e;
             if (e instanceof vg.ValidationError) {
                 throw new InternalServerError({
-                    message: translate('error:RESPONSE_VALIDATION,', 'Response validation failed'),
+                    message: translate('error:RESPONSE_VALIDATION,'),
                     code: 'RESPONSE_VALIDATION',
                     details: e.issues
                 }, e);

package/esm/http/http-server-request.js

@@ -5,7 +5,7 @@
 import accepts from 'accepts';
 import fresh from 'fresh';
 import parseRange from 'range-parser';
-import typeIs from 'type-is';
+import typeIs from '@browsery/type-is';
 import { isReadable, mergePrototype, OpraURL } from '@opra/common';
 import { HttpIncomingMessageHost } from './impl/http-incoming-message.host.js';
 function isHttpIncomingMessage(v) {

package/esm/index.js

@@ -1,4 +1,5 @@
 import "reflect-metadata";
+import './augmentation/18n.augmentation.js';
 import './augmentation/resource.augmentation.js';
 import './augmentation/collection.augmentation.js';
 import './augmentation/container.augmentation.js';

package/esm/platform-adapter.host.js

@@ -110,7 +110,7 @@ export class PlatformAdapterHost extends AsyncEventEmitter {
                 return { controller, endpoint, handler };
         }
         throw new BadRequestError({
-            message: translate('ACTION_NOT_FOUND', { resource: resource.name, action: name }, `The {{resource}} resource doesn't have an action named '{{action}}'`),
+            message: translate('error:ACTION_NOT_FOUND', { resource: resource.name, action: name }),
             severity: 'error',
             code: 'ACTION_NOT_FOUND'
         });
@@ -127,7 +127,7 @@ export class PlatformAdapterHost extends AsyncEventEmitter {
                 return { controller, endpoint, handler };
         }
         throw new ForbiddenError({
-            message: translate('OPERATION_FORBIDDEN', { resource: resource.name, operation: name }, `'The {{resource}} resource does not accept '{{operation}}' operations`),
+            message: translate('error:OPERATION_FORBIDDEN', { resource: resource.name, operation: name }),
             severity: 'error',
             code: 'OPERATION_FORBIDDEN'
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -27,7 +27,8 @@
     "clean:cover": "rimraf ../../coverage/core"
   },
   "dependencies": {
-    "@opra/common": "^0.27.0",
+    "@browsery/type-is": "^0.6.3",
+    "@opra/common": "^0.28.0",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "content-type": "^1.0.5",
@@ -42,14 +43,13 @@
     "putil-varhelpers": "^1.6.5",
     "range-parser": "^1.2.1",
     "strict-typed-events": "^2.3.2",
-    "type-is": "^1.6.18",
     "vary": "^1.1.2"
   },
   "peerDependencies": {
     "express": "^4.x.x || ^5.x.x"
   },
   "devDependencies": {
-    "@faker-js/faker": "^8.1.0",
+    "@faker-js/faker": "^8.2.0",
     "@types/accepts": "^1.3.5",
     "@types/content-disposition": "^0.5.6",
     "@types/content-type": "^1.1.6",

package/types/augmentation/18n.augmentation.d.ts

@@ -0,0 +1,7 @@
+declare module "@opra/common" {
+    interface I18n {
+        loadResourceDir(dirnames: string | string[], deep?: boolean, overwrite?: boolean): Promise<void>;
+        loadResourceBundle(lang: string, ns: string, filePath: string, deep?: boolean, overwrite?: boolean): Promise<void>;
+    }
+}
+export {};

package/types/index.d.ts

@@ -1,4 +1,5 @@
 import "reflect-metadata";
+import './augmentation/18n.augmentation.js';
 import './augmentation/resource.augmentation.js';
 import './augmentation/collection.augmentation.js';
 import './augmentation/container.augmentation.js';