proto.io 0.0.141 → 0.0.143

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { Server } from '@o2ter/server-js';
-import { Q as QueryValidator, g as generateId } from './internals/random-Dn9rhwfh.mjs';
+import { Q as QueryValidator, g as generateId } from './internals/random-BjV_01xP.mjs';
 import { P as PVK } from './internals/private-BUpLAMZi.mjs';
 import { asyncStream, asyncIterableToArray, isBinaryData, base64ToBuffer } from '@o2ter/utils-js';
 import { T as TQuery, M as MASTER_USER_HEADER_NAME, a as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, b as TUser, P as ProtoType, s as serialize, d as deserialize, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/index-ZIegYNKT.mjs';
@@ -692,7 +692,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)) {
@@ -700,15 +700,6 @@ const validateSchemaPermission = (schema) => {
             if (_.includes(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) => {
@@ -730,6 +721,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}`);
+            }
         }
     }
 };
@@ -741,8 +741,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 ?? []),
@@ -762,7 +763,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 = {