@opra/core 0.5.0 → 0.6.0

package/esm/services/json-collection-service.js

@@ -1,10 +1,7 @@
-import _ from 'lodash';
+import { isNil, omitBy } from 'lodash';
 import merge from 'putil-merge';
 import { nSQL } from "@nano-sql/core";
-import { BadRequestError, MethodNotAllowedError, ResourceConflictError } from '@opra/exception';
-import { CollectionResourceInfo, ComplexType } from '@opra/schema';
-import { $parse, ArrayExpression, BooleanLiteral, ComparisonExpression, DateLiteral, Expression, LogicalExpression, NullLiteral, NumberLiteral, ParenthesesExpression, QualifiedIdentifier, StringLiteral, TimeLiteral } from '@opra/url';
-import { pathToTree } from '../utils/path-to-tree.js';
+import { ArrayExpression, BadRequestError, BooleanLiteral, CollectionResourceInfo, ComparisonExpression, ComplexType, DateLiteral, Expression, LogicalExpression, MethodNotAllowedError, NullLiteral, NumberLiteral, ParenthesesExpression, parseFilter, pathToTree, QualifiedIdentifier, ResourceConflictError, StringLiteral, TimeLiteral } from '@opra/common';
 let dbId = 1;
 const indexingTypes = ['int', 'float', 'number', 'date', 'string'];
 export class JsonCollectionService {
@@ -248,9 +245,9 @@ export class JsonCollectionService {
         }
         switch (query.method) {
             case 'count': {
-                const options = _.omitBy({
+                const options = omitBy({
                     filter: this._convertFilter(query.filter)
-                }, _.isNil);
+                }, isNil);
                 return {
                     method: query.method,
                     options,
@@ -258,11 +255,11 @@ export class JsonCollectionService {
                 };
             }
             case 'create': {
-                const options = _.omitBy({
+                const options = omitBy({
                     pick: query.pick,
                     omit: query.omit,
                     include: query.include
-                }, _.isNil);
+                }, isNil);
                 const { data } = query;
                 return {
                     method: query.method,
@@ -273,11 +270,11 @@ export class JsonCollectionService {
             }
             case 'get': {
                 if (query.kind === 'CollectionGetQuery') {
-                    const options = _.omitBy({
+                    const options = omitBy({
                         pick: query.pick,
                         omit: query.omit,
                         include: query.include
-                    }, _.isNil);
+                    }, isNil);
                     const keyValue = query.keyValue;
                     return {
                         method: query.method,
@@ -296,7 +293,7 @@ export class JsonCollectionService {
                     throw new MethodNotAllowedError({
                         message: '$distinct parameter is not supported by JsonDataService'
                     });
-                const options = _.omitBy({
+                const options = omitBy({
                     pick: query.pick,
                     omit: query.omit,
                     include: query.include,
@@ -306,7 +303,7 @@ export class JsonCollectionService {
                     limit: query.limit,
                     offset: query.skip,
                     count: query.count,
-                }, _.isNil);
+                }, isNil);
                 return {
                     method: query.method,
                     options,
@@ -314,11 +311,11 @@ export class JsonCollectionService {
                 };
             }
             case 'update': {
-                const options = _.omitBy({
+                const options = omitBy({
                     pick: query.pick,
                     omit: query.omit,
                     include: query.include
-                }, _.isNil);
+                }, isNil);
                 const { data } = query;
                 const keyValue = query.keyValue;
                 return {
@@ -330,9 +327,9 @@ export class JsonCollectionService {
                 };
             }
             case 'updateMany': {
-                const options = _.omitBy({
+                const options = omitBy({
                     filter: this._convertFilter(query.filter)
-                }, _.isNil);
+                }, isNil);
                 const { data } = query;
                 return {
                     method: query.method,
@@ -351,9 +348,9 @@ export class JsonCollectionService {
                 };
             }
             case 'deleteMany': {
-                const options = _.omitBy({
+                const options = omitBy({
                     filter: this._convertFilter(query.filter)
-                }, _.isNil);
+                }, isNil);
                 return {
                     method: query.method,
                     options,
@@ -388,7 +385,7 @@ export class JsonCollectionService {
     }
     _convertFilter(str) {
         const ast = typeof str === 'string'
-            ? $parse(str)
+            ? parseFilter(str)
             : str;
         if (!ast || !(ast instanceof Expression))
             return ast;

package/esm/services/json-singleton-service.d.ts

@@ -1,5 +1,5 @@
-import { DataType, OpraQuery, OpraSchema } from '@opra/schema';
-import { QueryContext } from '../adapter/query-context.js';
+import { DataType, OpraQuery, OpraSchema } from '@opra/common';
+import { SingleRequestContext } from '../adapter/request-contexts/single-request-context.js';
 import { PartialOutput } from '../types.js';
 export interface JsonSingletonServiceOptions<T> {
     data: T;
@@ -9,7 +9,7 @@ export declare class JsonSingletonService<T, TOutput = PartialOutput<T>> {
     readonly dataType: DataType;
     protected _data?: T;
     constructor(dataType: DataType, options?: JsonSingletonServiceOptions<T>);
-    processRequest(ctx: QueryContext): Promise<any>;
+    processRequest(ctx: SingleRequestContext): Promise<any>;
     get(options?: JsonSingletonService.GetOptions): TOutput | undefined;
     protected _prepare(query: OpraQuery): {
         method: OpraSchema.SingletonMethod;

package/esm/services/json-singleton-service.js

@@ -1,5 +1,5 @@
-import _ from 'lodash';
-import { SingletonResourceInfo } from '@opra/schema';
+import { isNil, omitBy } from 'lodash';
+import { SingletonResourceInfo } from '@opra/common';
 export class JsonSingletonService {
     dataType;
     _data;
@@ -27,11 +27,11 @@ export class JsonSingletonService {
         }
         switch (query.method) {
             case 'create': {
-                const options = _.omitBy({
+                const options = omitBy({
                     pick: query.pick,
                     omit: query.omit,
                     include: query.include
-                }, _.isNil);
+                }, isNil);
                 const { data } = query;
                 return {
                     method: query.method,
@@ -42,11 +42,11 @@ export class JsonSingletonService {
             }
             case 'get': {
                 if (query.kind === 'CollectionGetQuery') {
-                    const options = _.omitBy({
+                    const options = omitBy({
                         pick: query.pick,
                         omit: query.omit,
                         include: query.include
-                    }, _.isNil);
+                    }, isNil);
                     const keyValue = query.keyValue;
                     return {
                         method: query.method,
@@ -61,11 +61,11 @@ export class JsonSingletonService {
                 break;
             }
             case 'update': {
-                const options = _.omitBy({
+                const options = omitBy({
                     pick: query.pick,
                     omit: query.omit,
                     include: query.include
-                }, _.isNil);
+                }, isNil);
                 const { data } = query;
                 const keyValue = query.keyValue;
                 return {

package/esm/utils/create-i18n.d.ts

@@ -1,3 +1,3 @@
-import { I18n } from '@opra/i18n';
-import { OpraAdapter } from '../adapter/adapter.js';
-export declare function createI18n(options?: OpraAdapter.I18nOptions): Promise<I18n>;
+import { I18n } from '@opra/common';
+import { I18nOptions } from '../interfaces/i18n-options.interface.js';
+export declare function createI18n(options?: I18nOptions): Promise<I18n>;

package/esm/utils/create-i18n.js

@@ -1,5 +1,5 @@
 import path from 'path';
-import { I18n } from '@opra/i18n';
+import { I18n } from '@opra/common';
 import { getCallerFile } from './get-caller-file.util.js';
 export async function createI18n(options) {
     const opts = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -28,16 +28,14 @@
   },
   "dependencies": {
     "@nano-sql/core": "^2.3.7",
-    "@opra/common": "^0.5.0",
-    "@opra/exception": "^0.5.0",
-    "@opra/i18n": "^0.5.0",
-    "@opra/optionals": "^0.5.0",
-    "@opra/schema": "^0.5.0",
-    "@opra/url": "^0.5.0",
-    "axiosist": "^1.0.0",
+    "@opra/common": "^0.6.0",
+    "@opra/optionals": "^0.6.0",
     "body-parser": "^1.20.1",
+    "dicer": "^0.3.1",
     "express": "^4.18.2",
+    "http-parser-js": "^0.5.8",
     "lodash": "^4.17.21",
+    "power-tasks": "^1.6.1",
     "putil-isplainobject": "^1.1.4",
     "putil-merge": "^3.9.0",
     "putil-varhelpers": "^1.6.4",
@@ -46,6 +44,7 @@
   },
   "devDependencies": {
     "@faker-js/faker": "^7.6.0",
+    "@types/dicer": "^0.2.2",
     "@types/express": "^4.17.14"
   },
   "type": "module",

package/cjs/utils/path-to-tree.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pathToTree = void 0;
-const dotPattern = /^([^.]+)\.(.*)$/;
-function pathToTree(arr, lowerCaseKeys) {
-    if (!arr.length)
-        return;
-    return _pathToTree(arr, {}, lowerCaseKeys);
-}
-exports.pathToTree = pathToTree;
-function _pathToTree(arr, target, lowerCaseKeys) {
-    for (let k of arr) {
-        if (lowerCaseKeys)
-            k = k.toLowerCase();
-        const m = dotPattern.exec(k);
-        if (m) {
-            const key = m[1];
-            if (target[key] === true)
-                continue;
-            const sub = target[key] = typeof target[key] === 'object' ? target[key] : {};
-            _pathToTree([m[2]], sub);
-        }
-        else {
-            target[k] = true;
-        }
-    }
-    return target;
-}

package/esm/adapter/metadata-resource.d.ts

@@ -1,8 +0,0 @@
-import { SingletonResourceInfo } from '@opra/schema';
-import { ISingletonResource } from '../interfaces/resource.interface.js';
-import { JsonSingletonService } from '../services/json-singleton-service.js';
-export declare class MetadataResource implements ISingletonResource<any> {
-    service: JsonSingletonService<any>;
-    init(resource: SingletonResourceInfo): void;
-    get(): any;
-}

package/esm/adapter/query-context.d.ts

@@ -1,24 +0,0 @@
-import { HeadersMap, HttpStatus } from '@opra/common';
-import { OpraException } from '@opra/exception';
-import { OpraDocument, OpraQuery } from '@opra/schema';
-import { OpraURLSearchParams } from '@opra/url';
-import { ContextType, IExecutionContext, IHttpExecutionContext } from '../interfaces/execution-context.interface.js';
-export declare type QueryContextArgs = Pick<QueryContext, 'service' | 'executionContext' | 'query' | 'params' | 'headers' | 'userContext' | 'parentValue' | 'continueOnError'>;
-export declare class QueryContext {
-    readonly service: OpraDocument;
-    readonly executionContext: IExecutionContext;
-    readonly query: OpraQuery;
-    readonly params: OpraURLSearchParams;
-    readonly headers: HeadersMap;
-    readonly parentValue?: any;
-    readonly resultPath: string;
-    readonly responseHeaders: HeadersMap;
-    response?: any;
-    errors: OpraException[];
-    status?: HttpStatus;
-    userContext?: any;
-    continueOnError?: boolean;
-    constructor(args: QueryContextArgs);
-    get type(): ContextType;
-    switchToHttp(): IHttpExecutionContext;
-}

package/esm/utils/path-to-tree.d.ts

@@ -1,4 +0,0 @@
-export interface ObjectTree {
-    [key: string]: boolean | ObjectTree;
-}
-export declare function pathToTree(arr: string[], lowerCaseKeys?: boolean): ObjectTree | undefined;

package/esm/utils/path-to-tree.js

@@ -1,24 +0,0 @@
-const dotPattern = /^([^.]+)\.(.*)$/;
-export function pathToTree(arr, lowerCaseKeys) {
-    if (!arr.length)
-        return;
-    return _pathToTree(arr, {}, lowerCaseKeys);
-}
-function _pathToTree(arr, target, lowerCaseKeys) {
-    for (let k of arr) {
-        if (lowerCaseKeys)
-            k = k.toLowerCase();
-        const m = dotPattern.exec(k);
-        if (m) {
-            const key = m[1];
-            if (target[key] === true)
-                continue;
-            const sub = target[key] = typeof target[key] === 'object' ? target[key] : {};
-            _pathToTree([m[2]], sub);
-        }
-        else {
-            target[k] = true;
-        }
-    }
-    return target;
-}