@opra/common 0.10.0 → 0.10.1

package/esm/i18n/i18n.js

@@ -1,5 +1,7 @@
 import { splitString, tokenize } from 'fast-tokenizer';
+import fs from 'fs';
 import i18next from 'i18next';
+import path from 'path';
 import { isUrl } from '../utils/index.js';
 import { unescapeString } from './string-utils.js';
 export const BaseI18n = Object.getPrototypeOf(i18next).constructor;
@@ -9,7 +11,7 @@ export class I18n extends BaseI18n {
         const options = typeof arg0 === 'object' ? arg0 : {};
         const callback = typeof arg0 === 'function' ? arg0 : arg1;
         try {
-            const t = await super.init(options);
+            const t = await super.init(options, callback);
             // Add formatters
             const formatter = this.services.formatter;
             formatter.add('lowercase', (value, lng) => value.toLocaleLowerCase(lng));
@@ -56,31 +58,28 @@ export class I18n extends BaseI18n {
             obj = (await fetch(filePath, { headers: { accept: 'application/json' } })).json();
         }
         else {
-            const fs = await import('fs/promises');
-            const content = await fs.readFile(filePath, 'utf8');
+            const content = fs.readFileSync(filePath, 'utf8');
             obj = JSON.parse(content);
         }
         this.addResourceBundle(lang, ns, obj, deep, overwrite);
     }
     async loadResourceDir(dirnames, deep, overwrite) {
-        const fs = await import('fs/promises');
-        const path = await import('path');
         for (const dirname of Array.isArray(dirnames) ? dirnames : [dirnames]) {
             /* istanbul ignore next */
-            if (!(await fs.stat(dirname)).isDirectory()) {
+            if (!(fs.statSync(dirname)).isDirectory()) {
                 // eslint-disable-next-line no-console
                 console.warn(`Locale directory does not exists. (${dirname})`);
                 continue;
             }
-            const languageDirs = await fs.readdir(dirname);
+            const languageDirs = fs.readdirSync(dirname);
             for (const lang of languageDirs) {
                 const langDir = path.join(dirname, lang);
-                if ((await fs.stat(langDir)).isDirectory()) {
-                    const nsDirs = await fs.readdir(langDir);
+                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' && (await fs.stat(nsFilePath)).isFile()) {
+                        if (ext === '.json' && (fs.statSync(nsFilePath)).isFile()) {
                             const ns = path.basename(nsfile, ext);
                             await this.loadResourceBundle(lang, ns, nsFilePath, deep, overwrite);
                         }

package/esm/schema/decorators/opr-collection-resource.decorator.js

@@ -1,5 +1,5 @@
 import "reflect-metadata";
-import { omit } from 'lodash';
+import omit from 'lodash.omit';
 import { RESOURCE_METADATA } from '../constants.js';
 const NESTJS_INJECTABLE_WATERMARK = '__injectable__';
 const NAME_PATTERN = /^(.*)Resource$/;

package/esm/schema/decorators/opr-complex-type.decorator.js

@@ -1,4 +1,4 @@
-import { omit } from 'lodash';
+import omit from 'lodash.omit';
 import { DATATYPE_METADATA } from '../constants.js';
 const NAME_PATTERN = /^(.*)Type$/;
 export function OprComplexType(options) {

package/esm/schema/decorators/opr-field.decorator.js

@@ -1,4 +1,4 @@
-import { omit } from 'lodash';
+import omit from 'lodash.omit';
 import { COMPLEXTYPE_FIELDS } from '../constants.js';
 export function OprField(args) {
     return (target, propertyKey) => {

package/esm/schema/decorators/opr-simple-type.decorator.js

@@ -1,4 +1,4 @@
-import { omit } from 'lodash';
+import omit from 'lodash.omit';
 import { DATATYPE_METADATA } from '../constants.js';
 const NAME_PATTERN = /^(.*)Type$/;
 export function OprSimpleType(options) {

package/esm/schema/decorators/opr-singleton-resource.decorator.js

@@ -1,5 +1,5 @@
 import "reflect-metadata";
-import { omit } from 'lodash';
+import omit from 'lodash.omit';
 import { RESOURCE_METADATA } from '../constants.js';
 const NESTJS_INJECTABLE_WATERMARK = '__injectable__';
 const NAME_PATTERN = /^(.*)Resource$/;

package/esm/schema/implementation/data-type/union-type.js

@@ -1,4 +1,4 @@
-import { omit } from 'lodash';
+import omit from 'lodash.omit';
 import { colorFgMagenta, colorFgYellow, colorReset, nodeInspectCustom } from '../../utils/inspect.util.js';
 import { ComplexType } from './complex-type.js';
 import { DataType } from './data-type.js';

package/esm/schema/implementation/document-builder.js

@@ -1,4 +1,4 @@
-import { isPromise } from 'putil-promisify';
+import promisify from 'putil-promisify';
 import { ResponsiveMap } from '../../helpers/responsive-map.js';
 import { OpraSchema } from '../opra-schema.definition.js';
 import { isConstructor } from '../utils/class.utils.js';
@@ -62,7 +62,7 @@ export class DocumentBuilder {
         }
     }
     async addDataTypeClass(thunk) {
-        thunk = isPromise(thunk) ? await thunk : thunk;
+        thunk = promisify.isPromise(thunk) ? await thunk : thunk;
         if (!isConstructor(thunk))
             return this.addDataTypeClass(thunk());
         const internalTypeName = primitiveClasses.get(thunk);
@@ -112,7 +112,7 @@ export class DocumentBuilder {
         this._resources.set(name, schema);
     }
     async addResourceInstance(thunk) {
-        thunk = isPromise(thunk) ? await thunk : thunk;
+        thunk = promisify.isPromise(thunk) ? await thunk : thunk;
         let instance;
         if (typeof thunk === 'function') {
             if (isConstructor(thunk)) {

package/esm/schema/implementation/opra-document.js

@@ -1,4 +1,4 @@
-import { omit } from 'lodash';
+import omit from 'lodash.omit';
 import { ResponsiveMap } from '../../helpers/responsive-map.js';
 import { OpraSchema } from '../opra-schema.definition.js';
 import { cloneObject } from '../utils/clone-object.util.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Opra internationalization package",
   "author": "Panates",
   "license": "MIT",
@@ -23,19 +23,19 @@
     "clean": "npm run clean:src && npm run clean:dist && npm run clean:cover",
     "clean:src": "ts-cleanup -s src --all",
     "clean:dist": "rimraf ../../build/common",
-    "clean:cover": "rimraf ../../coverage/common"
+    "clean:cover": "rimraf ../../coverage/common",
+    "antlr4": "java -jar ./tools/antlr4-4.11.2-SNAPSHOT-complete.jar -Dlanguage=TypeScript ./src/filter/antlr/OpraFilter.g4 -visitor"
   },
   "dependencies": {
-    "antlr4ts": "^0.5.0-alpha.4",
+    "antlr4": "^4.12.0-beta.3",
     "fast-tokenizer": "^1.2.0",
     "highland": "^2.13.5",
     "http-parser-js": "^0.5.8",
     "i18next": "^22.4.6",
-    "lodash": "^4.17.21",
-    "luxon": "^3.1.1",
+    "lodash.omit": "^4.5.0",
     "putil-isplainobject": "^1.1.4",
     "putil-merge": "^3.9.0",
-    "putil-promisify": "^1.8.5",
+    "putil-promisify": "^1.10.0",
     "putil-varhelpers": "^1.6.4",
     "reflect-metadata": "^0.1.13",
     "uid": "^2.0.1"
@@ -67,4 +67,4 @@
     "opra",
     "common"
   ]
-}
+}

package/cjs/filter/error-listener.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ErrorListener = void 0;
-const errors_js_1 = require("./errors.js");
-class ErrorListener {
-    constructor(errors) {
-        this.errors = errors;
-    }
-    syntaxError(recognizer, offendingSymbol, line, charPositionInLine, msg, e) {
-        this.errors.push(new errors_js_1.FilterParseError(msg, { recognizer, offendingSymbol, line, charPositionInLine, e }));
-    }
-}
-exports.ErrorListener = ErrorListener;

package/esm/filter/error-listener.d.ts

@@ -1,8 +0,0 @@
-import { ANTLRErrorListener, Recognizer } from 'antlr4ts';
-import { RecognitionException } from 'antlr4ts/RecognitionException';
-import { FilterParseError } from './errors.js';
-export declare class ErrorListener implements ANTLRErrorListener<any> {
-    errors: FilterParseError[];
-    constructor(errors: FilterParseError[]);
-    syntaxError<T>(recognizer: Recognizer<T, any>, offendingSymbol: T | undefined, line: number, charPositionInLine: number, msg: string, e: RecognitionException | undefined): void;
-}

package/esm/filter/error-listener.js

@@ -1,9 +0,0 @@
-import { FilterParseError } from './errors.js';
-export class ErrorListener {
-    constructor(errors) {
-        this.errors = errors;
-    }
-    syntaxError(recognizer, offendingSymbol, line, charPositionInLine, msg, e) {
-        this.errors.push(new FilterParseError(msg, { recognizer, offendingSymbol, line, charPositionInLine, e }));
-    }
-}