@opra/common 0.27.2 → 0.28.0

package/browser.js

@@ -367,8 +367,6 @@ var ResponsiveMap = class extends Map {
 
 // ../../build/common/esm/i18n/i18n.js
 import { splitString, tokenize } from "fast-tokenizer";
-import fs from "@browsery/fs";
-import path from "path-browserify";
 import i18next from "@browsery/i18next";
 
 // ../../build/common/esm/i18n/string-utils.js
@@ -384,8 +382,7 @@ function unescapeString(s) {
 __name(unescapeString, "unescapeString");
 
 // ../../build/common/esm/i18n/i18n.js
-var BaseI18n = Object.getPrototypeOf(i18next).constructor;
-var globalLocaleDirs = [];
+var BaseI18n = Object.getPrototypeOf(i18next.createInstance()).constructor;
 var I18n = class _I18n extends BaseI18n {
   static {
     __name(this, "I18n");
@@ -399,11 +396,6 @@ var I18n = class _I18n extends BaseI18n {
       formatter.add("lowercase", (value, lng) => value.toLocaleLowerCase(lng));
       formatter.add("uppercase", (value, lng) => value.toLocaleUpperCase(lng));
       formatter.add("upperFirst", (value, lng) => value.charAt(0).toLocaleUpperCase(lng) + value.substring(1));
-      if (globalLocaleDirs.length)
-        await this.loadResourceDir(globalLocaleDirs, false, true);
-      if (options?.resourceDirs?.length) {
-        await this.loadResourceDir(options.resourceDirs, false, true);
-      }
       if (options?.resources) {
         for (const lang of Object.keys(options.resources)) {
           const langObj = options.resources[lang];
@@ -427,40 +419,6 @@ var I18n = class _I18n extends BaseI18n {
     const objectStack = /* @__PURE__ */ new WeakMap();
     return this._deepTranslate(input, objectStack, options);
   }
-  registerLocaleDir(...dirname) {
-    globalLocaleDirs.push(...dirname);
-  }
-  async loadResourceBundle(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);
-  }
-  async loadResourceDir(dirnames, deep, overwrite) {
-    for (const dirname of Array.isArray(dirnames) ? dirnames : [dirnames]) {
-      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);
-            }
-          }
-        }
-      }
-    }
-  }
   createInstance(options = {}, callback) {
     return new _I18n(options, callback);
   }
@@ -1251,10 +1209,10 @@ var ContainerClass = class _ContainerClass extends Resource {
     }
     return schema;
   }
-  getResource(path2, silent) {
+  getResource(path, silent) {
     let resource;
-    if (path2.includes("/")) {
-      const arr = path2.split("/");
+    if (path.includes("/")) {
+      const arr = path.split("/");
       let i;
       const l = arr.length;
       let container = this;
@@ -1268,37 +1226,37 @@ var ContainerClass = class _ContainerClass extends Resource {
       if (!resource || i < l - 1)
         resource = void 0;
     } else
-      resource = this.resources.get(path2);
+      resource = this.resources.get(path);
     if (resource || silent)
       return resource;
-    throw new ResourceNotFoundError(path2);
+    throw new ResourceNotFoundError(path);
   }
-  getContainer(path2, silent) {
-    const t = this.getResource(path2);
+  getContainer(path, silent) {
+    const t = this.getResource(path);
     if (!t && silent)
       return;
     if (t && t.kind === opra_schema_ns_exports.Container.Kind)
       return t;
     throw new NotAcceptableError(`Resource type "${t.name}" is not a Container`);
   }
-  getCollection(path2, silent) {
-    const t = this.getResource(path2);
+  getCollection(path, silent) {
+    const t = this.getResource(path);
     if (!t && silent)
       return;
     if (t && t.kind === opra_schema_ns_exports.Collection.Kind)
       return t;
     throw new NotAcceptableError(`Resource type "${t.name}" is not a Collection`);
   }
-  getSingleton(path2, silent) {
-    const t = this.getResource(path2);
+  getSingleton(path, silent) {
+    const t = this.getResource(path);
     if (!t && silent)
       return;
     if (t && t.kind === opra_schema_ns_exports.Singleton.Kind)
       return t;
     throw new NotAcceptableError(`Resource type "${t.name}" is not a Singleton`);
   }
-  getStorage(path2, silent) {
-    const t = this.getResource(path2);
+  getStorage(path, silent) {
+    const t = this.getResource(path);
     if (!t && silent)
       return;
     if (t && t.kind === opra_schema_ns_exports.Storage.Kind)
@@ -1579,8 +1537,8 @@ var ComplexTypeClass = class extends DataType {
       throw new Error(translate("error:UNKNOWN_FIELD", { field: nameOrPath }));
     return field;
   }
-  iteratePath(path2, silent) {
-    const arr = path2.split(".");
+  iteratePath(path, silent) {
+    const arr = path.split(".");
     const len = arr.length;
     let dataType = this;
     let field;
@@ -1990,20 +1948,20 @@ var ApiDocument = class extends TypeDocument {
     super(...arguments);
     this.root = new Container2(this, { name: "" });
   }
-  getResource(path2, silent) {
-    return this.root.getResource(path2, silent);
+  getResource(path, silent) {
+    return this.root.getResource(path, silent);
   }
-  getContainer(path2, silent) {
-    return this.root.getContainer(path2, silent);
+  getContainer(path, silent) {
+    return this.root.getContainer(path, silent);
   }
-  getCollection(path2, silent) {
-    return this.root.getCollection(path2, silent);
+  getCollection(path, silent) {
+    return this.root.getCollection(path, silent);
   }
-  getSingleton(path2, silent) {
-    return this.root.getSingleton(path2, silent);
+  getSingleton(path, silent) {
+    return this.root.getSingleton(path, silent);
   }
-  getStorage(path2, silent) {
-    return this.root.getStorage(path2, silent);
+  getStorage(path, silent) {
+    return this.root.getStorage(path, silent);
   }
   /**
    * Export as Opra schema definition object
@@ -10545,8 +10503,8 @@ var CollectionClass = class extends CrudResource {
       return result;
     }
   }
-  normalizeFieldPath(path2) {
-    return this.type.normalizeFieldPath(path2);
+  normalizeFieldPath(path) {
+    return this.type.normalizeFieldPath(path);
   }
   normalizeSortFields(fields) {
     const normalized = this.type.normalizeFieldPath(fields);
@@ -10889,8 +10847,8 @@ var SingletonClass = class extends CrudResource {
       type: this.type.name || "any"
     };
   }
-  normalizeFieldPath(path2) {
-    return this.type.normalizeFieldPath(path2);
+  normalizeFieldPath(path) {
+    return this.type.normalizeFieldPath(path);
   }
 };
 
@@ -11631,8 +11589,8 @@ var OpraURL = class _OpraURL {
   get path() {
     return this[kPath];
   }
-  set path(path2) {
-    this[kPath] = path2 instanceof OpraURLPath ? path2 : new OpraURLPath(path2);
+  set path(path) {
+    this[kPath] = path instanceof OpraURLPath ? path : new OpraURLPath(path);
     this[kContext].pathname = String(this[kPath]);
     this.invalidate();
   }

package/cjs/i18n/i18n.js

@@ -3,13 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.I18n = exports.BaseI18n = void 0;
 const tslib_1 = require("tslib");
 const fast_tokenizer_1 = require("fast-tokenizer");
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const path_1 = tslib_1.__importDefault(require("path"));
 const i18next_1 = tslib_1.__importDefault(require("@browsery/i18next"));
-const index_js_1 = require("../helpers/index.js");
 const string_utils_js_1 = require("./string-utils.js");
-exports.BaseI18n = Object.getPrototypeOf(i18next_1.default).constructor;
-const globalLocaleDirs = [];
+exports.BaseI18n = Object.getPrototypeOf(i18next_1.default.createInstance()).constructor;
 class I18n extends exports.BaseI18n {
     async init(arg0, arg1) {
         const options = typeof arg0 === 'object' ? arg0 : {};
@@ -21,13 +17,6 @@ class I18n extends exports.BaseI18n {
             formatter.add('lowercase', (value, lng) => value.toLocaleLowerCase(lng));
             formatter.add('uppercase', (value, lng) => value.toLocaleUpperCase(lng));
             formatter.add('upperFirst', (value, lng) => value.charAt(0).toLocaleUpperCase(lng) + value.substring(1));
-            // Load globally registered resources
-            if (globalLocaleDirs.length)
-                await this.loadResourceDir(globalLocaleDirs, false, true);
-            // Load resource dirs and overwrite existing
-            if (options?.resourceDirs?.length) {
-                await this.loadResourceDir(options.resourceDirs, false, true);
-            }
             // overwrite existing resources with options.resources
             if (options?.resources) {
                 for (const lang of Object.keys(options.resources)) {
@@ -53,42 +42,6 @@ class I18n extends exports.BaseI18n {
         const objectStack = new WeakMap();
         return this._deepTranslate(input, objectStack, options);
     }
-    registerLocaleDir(...dirname) {
-        globalLocaleDirs.push(...dirname);
-    }
-    async loadResourceBundle(lang, ns, filePath, deep, overwrite) {
-        let obj;
-        if ((0, index_js_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);
-    }
-    async loadResourceDir(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);
-                        }
-                    }
-                }
-            }
-        }
-    }
     createInstance(options = {}, callback) {
         return new I18n(options, callback);
     }

package/esm/i18n/i18n.js

@@ -1,11 +1,7 @@
 import { splitString, tokenize } from 'fast-tokenizer';
-import fs from 'fs';
-import path from 'path';
 import i18next from '@browsery/i18next';
-import { isUrlString } from '../helpers/index.js';
 import { unescapeString } from './string-utils.js';
-export const BaseI18n = Object.getPrototypeOf(i18next).constructor;
-const globalLocaleDirs = [];
+export const BaseI18n = Object.getPrototypeOf(i18next.createInstance()).constructor;
 export class I18n extends BaseI18n {
     async init(arg0, arg1) {
         const options = typeof arg0 === 'object' ? arg0 : {};
@@ -17,13 +13,6 @@ export class I18n extends BaseI18n {
             formatter.add('lowercase', (value, lng) => value.toLocaleLowerCase(lng));
             formatter.add('uppercase', (value, lng) => value.toLocaleUpperCase(lng));
             formatter.add('upperFirst', (value, lng) => value.charAt(0).toLocaleUpperCase(lng) + value.substring(1));
-            // Load globally registered resources
-            if (globalLocaleDirs.length)
-                await this.loadResourceDir(globalLocaleDirs, false, true);
-            // Load resource dirs and overwrite existing
-            if (options?.resourceDirs?.length) {
-                await this.loadResourceDir(options.resourceDirs, false, true);
-            }
             // overwrite existing resources with options.resources
             if (options?.resources) {
                 for (const lang of Object.keys(options.resources)) {
@@ -49,42 +38,6 @@ export class I18n extends BaseI18n {
         const objectStack = new WeakMap();
         return this._deepTranslate(input, objectStack, options);
     }
-    registerLocaleDir(...dirname) {
-        globalLocaleDirs.push(...dirname);
-    }
-    async loadResourceBundle(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);
-    }
-    async loadResourceDir(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);
-                        }
-                    }
-                }
-            }
-        }
-    }
     createInstance(options = {}, callback) {
         return new I18n(options, callback);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "0.27.2",
+  "version": "0.28.0",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",

package/types/i18n/i18n.d.ts

@@ -18,9 +18,6 @@ export declare class I18n extends BaseI18n {
     init(callback?: InitCallback): Promise<TranslateFunction>;
     init(options: InitOptions, callback?: InitCallback): Promise<TranslateFunction>;
     deep(input: any, options?: DeepTranslateOptions): any;
-    registerLocaleDir(...dirname: string[]): void;
-    loadResourceBundle(lang: string, ns: string, filePath: string, deep?: boolean, overwrite?: boolean): Promise<void>;
-    loadResourceDir(dirnames: string | string[], deep?: boolean, overwrite?: boolean): Promise<void>;
     createInstance(options: {} | undefined, callback: any): I18n;
     static createInstance(options?: InitOptions, callback?: InitCallback): I18n;
     protected _deepTranslate(input: any, objectStack: WeakMap<object, any>, options?: DeepTranslateOptions): any;