proto.io 0.0.141 → 0.0.143

package/dist/adapters/file/database.d.ts

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-BabXTvEZ.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DCjn9EDu.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-DW9_3n_K.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-i4lOAqi2.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/filesystem.d.ts

@@ -1,5 +1,5 @@
-import { P as ProtoService } from '../../internals/index-BabXTvEZ.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DCjn9EDu.js';
+import { P as ProtoService } from '../../internals/index-DW9_3n_K.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-i4lOAqi2.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/google-cloud-storage.d.ts

@@ -1,7 +1,7 @@
 import * as _google_cloud_storage from '@google-cloud/storage';
 import { Storage } from '@google-cloud/storage';
-import { P as ProtoService } from '../../internals/index-BabXTvEZ.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DCjn9EDu.js';
+import { P as ProtoService } from '../../internals/index-DW9_3n_K.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-i4lOAqi2.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/storage/progres.d.ts

@@ -1,5 +1,5 @@
 import { Pool, PoolClient, PoolConfig } from 'pg';
-import { _ as _TValue, o as EventData, T as TSchema, q as DecodedQuery, F as FindOptions, Q as QuerySelector, r as DecodedSortOption, I as InsertOptions, t as TValue, u as FindOneOptions, v as TUpdateOp, w as FieldSelectorExpression, x as QueryExpression, y as TStorage, z as TransactionOptions, h as TObject, A as TQueryRandomOptions, B as TPubSub } from '../../internals/index-BabXTvEZ.js';
+import { _ as _TValue, o as EventData, T as TSchema, q as DecodedQuery, F as FindOptions, Q as QuerySelector, r as DecodedSortOption, I as InsertOptions, t as TValue, u as FindOneOptions, v as TUpdateOp, w as FieldSelectorExpression, x as QueryExpression, y as TStorage, z as TransactionOptions, h as TObject, A as TQueryRandomOptions, B as TPubSub } from '../../internals/index-DW9_3n_K.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';

package/dist/adapters/storage/progres.js

@@ -11,7 +11,7 @@ var Decimal = require('decimal.js');
 var utils = require('pg/lib/utils');
 var index$1 = require('../../internals/index-DZS2c96L.js');
 require('@o2ter/crypto-js');
-var random$1 = require('../../internals/random-CiJ8I0Cd.js');
+var random$1 = require('../../internals/random-XGNkddOu.js');
 var _private = require('../../internals/private-CSB1Ep4g.js');
 
 //

package/dist/adapters/storage/progres.mjs

@@ -7,7 +7,7 @@ import Decimal from 'decimal.js';
 import { escapeLiteral, escapeIdentifier } from 'pg/lib/utils';
 import { a as QueryCoditionalSelector, b as QueryFieldSelector, c as QueryExpressionSelector, d as QueryDistanceExpression, e as QueryCoditionalExpression, f as QueryComparisonExpression, g as QueryNotExpression, h as QueryArrayExpression, i as QueryValueExpression, j as QueryKeyExpression, Q as QuerySelector, F as FieldSelectorExpression } from '../../internals/index-DTZ5uRgF.mjs';
 import '@o2ter/crypto-js';
-import { _ as _resolveColumn, g as generateId, Q as QueryValidator } from '../../internals/random-Dn9rhwfh.mjs';
+import { _ as _resolveColumn, g as generateId, Q as QueryValidator } from '../../internals/random-BjV_01xP.mjs';
 import { P as PVK } from '../../internals/private-BUpLAMZi.mjs';
 
 //

package/dist/client.d.ts

@@ -1,7 +1,7 @@
-import { P as ProtoClient } from './internals/index-BtnEuEVn.js';
-export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-BtnEuEVn.js';
+import { P as ProtoClient } from './internals/index-DWyLziGT.js';
+export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-DWyLziGT.js';
 export { Decimal } from 'decimal.js';
-export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-BabXTvEZ.js';
+export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-DW9_3n_K.js';
 import '@o2ter/utils-js';
 import 'socket.io-client';
 import '@socket.io/component-emitter';

package/dist/index.d.ts

@@ -2,11 +2,11 @@ import * as socket_io from 'socket.io';
 import * as socket_io_dist_typed_events from 'socket.io/dist/typed-events';
 import * as express_serve_static_core from 'express-serve-static-core';
 import { Server, RequestHandler } from '@o2ter/server-js';
-import { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-BabXTvEZ.js';
-export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-BabXTvEZ.js';
+import { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-DW9_3n_K.js';
+export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-DW9_3n_K.js';
 import Decimal from 'decimal.js';
 export { Decimal } from 'decimal.js';
-export { P as ProtoClient, c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-BtnEuEVn.js';
+export { P as ProtoClient, c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-DWyLziGT.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';

package/dist/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
 var serverJs = require('@o2ter/server-js');
-var random = require('./internals/random-CiJ8I0Cd.js');
+var random = require('./internals/random-XGNkddOu.js');
 var _private = require('./internals/private-CSB1Ep4g.js');
 var utilsJs = require('@o2ter/utils-js');
 var index = require('./internals/index-D5nf79vF.js');
@@ -695,7 +695,7 @@ const validateShapedObject = (schema, dataType) => {
         }
     }
 };
-const validateSchemaPermission = (schema) => {
+const validateSchemaName = (schema) => {
     if (!_.isNil(schema['_Schema']) || !_.isNil(schema['_Config']))
         throw Error('Reserved name of class');
     for (const [, _schema] of _.toPairs(schema)) {
@@ -703,15 +703,6 @@ const validateSchemaPermission = (schema) => {
             if (_.includes(index$1.TObject.defaultKeys, key))
                 throw Error(`Reserved field name: ${key}`);
         }
-        const fields = _.keys(_schema.fields);
-        for (const key of _.keys(_schema.fieldLevelPermissions)) {
-            if (!fields.includes(key))
-                throw Error(`Invalid field permission: ${key}`);
-        }
-        for (const key of _schema.secureFields ?? []) {
-            if (!fields.includes(key))
-                throw Error(`Invalid field permission: ${key}`);
-        }
     }
 };
 const validateSchema = (schema) => {
@@ -733,6 +724,15 @@ const validateSchema = (schema) => {
                     throw Error(`Invalid target: ${key}`);
                 validateForeignField(schema, key, dataType);
             }
+            const fields = _.keys(_schema.fields);
+            for (const key of _.keys(_schema.fieldLevelPermissions)) {
+                if (!fields.includes(key))
+                    throw Error(`Invalid field permission: ${key}`);
+            }
+            for (const key of _schema.secureFields ?? []) {
+                if (!fields.includes(key))
+                    throw Error(`Invalid field permission: ${key}`);
+            }
         }
     }
 };
@@ -744,8 +744,9 @@ const mergeSchema = (...schemas) => _.reduce(schemas, (acc, schema) => ({
             ...(acc[className]?.fields ?? {}),
             ...s.fields,
         },
-        classLevelPermissions: _.mergeWith(acc[className]?.classLevelPermissions, s.classLevelPermissions, (l, r) => _.isArray(l) ? [...l, ...r] : undefined),
-        fieldLevelPermissions: _.mergeWith(acc[className]?.fieldLevelPermissions, s.fieldLevelPermissions, (l, r) => _.isArray(l) ? [...l, ...r] : undefined),
+        classLevelPermissions: _.mergeWith(acc[className]?.classLevelPermissions ?? {}, s.classLevelPermissions, (l, r) => _.isArray(l) ? [...l, ...r] : undefined),
+        additionalObjectPermissions: _.mergeWith(acc[className]?.additionalObjectPermissions ?? {}, s.additionalObjectPermissions, (l, r) => _.isArray(l) ? [...l, ...r] : undefined),
+        fieldLevelPermissions: _.mergeWith(acc[className]?.fieldLevelPermissions ?? {}, s.fieldLevelPermissions, (l, r) => _.isArray(l) ? [...l, ...r] : undefined),
         secureFields: [
             ...(acc[className]?.secureFields ?? []),
             ...(s.secureFields ?? []),
@@ -765,7 +766,7 @@ class ProtoInternal {
     functions = {};
     triggers = {};
     constructor(options) {
-        validateSchemaPermission(options.schema);
+        validateSchemaName(options.schema);
         const schema = mergeSchema(defaultSchema, options.fileStorage.schema, options.schema);
         validateSchema(schema);
         this.options = {