proto.io 0.0.140 → 0.0.142

package/dist/index.mjs

@@ -692,15 +692,21 @@ const validateShapedObject = (schema, dataType) => {
         }
     }
 };
-const validateSchema = (schema) => {
+const validateSchemaName = (schema) => {
     if (!_.isNil(schema['_Schema']) || !_.isNil(schema['_Config']))
         throw Error('Reserved name of class');
+    for (const [, _schema] of _.toPairs(schema)) {
+        for (const [key] of _.toPairs(_schema.fields)) {
+            if (_.includes(TObject.defaultKeys, key))
+                throw Error(`Reserved field name: ${key}`);
+        }
+    }
+};
+const validateSchema = (schema) => {
     for (const [className, _schema] of _.toPairs(schema)) {
         if (!className.match(QueryValidator.patterns.name))
             throw Error(`Invalid class name: ${className}`);
         for (const [key, dataType] of _.toPairs(_schema.fields)) {
-            if (_.includes(TObject.defaultKeys, key))
-                throw Error(`Reserved field name: ${key}`);
             if (!key.match(QueryValidator.patterns.name))
                 throw Error(`Invalid field name: ${key}`);
             if (isShape(dataType)) {
@@ -715,15 +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}`);
+            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}`);
+            }
         }
     }
 };
@@ -756,10 +762,12 @@ class ProtoInternal {
     functions = {};
     triggers = {};
     constructor(options) {
-        validateSchema(options.schema);
+        validateSchemaName(options.schema);
+        const schema = mergeSchema(defaultSchema, options.fileStorage.schema, options.schema);
+        validateSchema(schema);
         this.options = {
             ...options,
-            schema: mergeSchema(defaultSchema, options.fileStorage.schema, options.schema),
+            schema,
         };
     }
     async prepare() {