@palmares/schemas 0.1.20 → 0.1.22

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @palmares/schemas
 
+## 0.1.22
+
+### Patch Changes
+
+- 80b60c3: Go back to dependencies from peerDependencies, should work fine now
+- Updated dependencies [80b60c3]
+  - @palmares/databases@0.1.18
+  - @palmares/server@0.1.15
+
+## 0.1.21
+
+### Patch Changes
+
+- c5f4e08: - Added ESModules support, you can have deeply nested packages and it wont affect the function of your app. For example, if module A has a dependency in @palmares/schema, and palmares schema depends on @palmares/core, it will work normally
+- Updated dependencies [c5f4e08]
+  - @palmares/databases@0.1.17
+  - @palmares/server@0.1.14
+  - @palmares/core@0.1.14
+
 ## 0.1.20
 
 ### Patch Changes

package/dist/cjs/src/adapter/index.js

@@ -169,6 +169,8 @@ var SchemaAdapter = /*#__PURE__*/ function() {
     "use strict";
     function SchemaAdapter() {
         _class_call_check(this, SchemaAdapter);
+        _define_property(this, "$$type", '$PSchemaAdapter');
+        _define_property(this, "name", void 0);
         _define_property(this, "field", void 0);
         _define_property(this, "number", void 0);
         _define_property(this, "object", void 0);

package/dist/cjs/src/conf.js

@@ -17,11 +17,10 @@ _export(exports, {
     }
 });
 var _exceptions = require("./exceptions");
-var cachedAdapter = null;
 function setDefaultAdapter(adapter) {
-    cachedAdapter = adapter;
+    globalThis.$PSchemasAdapter = adapter;
 }
 function getDefaultAdapter() {
-    if (!cachedAdapter) throw new _exceptions.NoAdapterFoundError();
-    return cachedAdapter;
+    if (!globalThis.$PSchemasAdapter) throw new _exceptions.NoAdapterFoundError();
+    return globalThis.$PSchemasAdapter;
 }

package/dist/cjs/src/model.js

@@ -8,14 +8,12 @@ Object.defineProperty(exports, "modelSchema", {
         return modelSchema;
     }
 });
-var _databases = require("@palmares/databases");
 var _exceptions = require("./exceptions");
 var _schema = require("./schema");
 var _array = require("./schema/array");
 var _boolean = require("./schema/boolean");
 var _datetime = require("./schema/datetime");
 var _object = require("./schema/object");
-var _schema1 = require("./schema/schema");
 var _string = require("./schema/string");
 var _union = require("./schema/union");
 function _array_like_to_array(arr, len) {
@@ -71,13 +69,6 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _iterable_to_array(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -229,12 +220,13 @@ function getSchemaFromModelField(model, field, parent, definedFields, engineInst
 }
 function _getSchemaFromModelField() {
     _getSchemaFromModelField = _async_to_generator(function(model, field, parent, definedFields, engineInstanceName, options) {
-        var schema, allChoicesOfTypeStrings, allChoicesOfTypeNumbers, schemaForChoicesAsStrings, schemaForChoicesAsNumbers, _parent___data, _parent___data1, doesADefinedFieldExistWithRelatedName, doesADefinedFieldExistWithRelationName, fieldWithRelatedName, fieldWithRelationName, isFieldWithRelatedNameAModelField, isFieldWithRelationNameAModelField, relatedToModel, toField, engineInstance, relatedToModelInstance, modelFieldsOfRelatedModel;
+        var fieldAsAny, schema, allChoicesOfTypeStrings, allChoicesOfTypeNumbers, schemaForChoicesAsStrings, schemaForChoicesAsNumbers, _parent___data, _parent___data1, fieldAsForeignKey, doesADefinedFieldExistWithRelatedName, doesADefinedFieldExistWithRelationName, fieldWithRelatedName, fieldWithRelationName, isFieldWithRelatedNameAModelField, isFieldWithRelationNameAModelField, relatedToModel, toField, engineInstance, relatedToModelInstance, modelFieldsOfRelatedModel, _field_customAttributes_schema;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
+                    fieldAsAny = field;
                     schema = undefined;
-                    if (!(_instanceof(field, _databases.AutoField) || _instanceof(field, _databases.BigAutoField))) return [
+                    if (!((fieldAsAny === null || fieldAsAny === void 0 ? void 0 : fieldAsAny['$$type']) === '$PAutoField' || (fieldAsAny === null || fieldAsAny === void 0 ? void 0 : fieldAsAny['$$type']) === '$PBigAutoField')) return [
                         3,
                         1
                     ];
@@ -244,7 +236,7 @@ function _getSchemaFromModelField() {
                         11
                     ];
                 case 1:
-                    if (!_instanceof(field, _databases.DecimalField)) return [
+                    if (!((fieldAsAny === null || fieldAsAny === void 0 ? void 0 : fieldAsAny['$$type']) === '$PDecimalField')) return [
                         3,
                         2
                     ];
@@ -254,7 +246,7 @@ function _getSchemaFromModelField() {
                         11
                     ];
                 case 2:
-                    if (!_instanceof(field, _databases.IntegerField)) return [
+                    if (!((fieldAsAny === null || fieldAsAny === void 0 ? void 0 : fieldAsAny['$$type']) === '$PIntegerField')) return [
                         3,
                         3
                     ];
@@ -264,7 +256,7 @@ function _getSchemaFromModelField() {
                         11
                     ];
                 case 3:
-                    if (!_instanceof(field, _databases.BooleanField)) return [
+                    if (!((fieldAsAny === null || fieldAsAny === void 0 ? void 0 : fieldAsAny['$$type']) === '$PBooleanField')) return [
                         3,
                         4
                     ];
@@ -274,15 +266,16 @@ function _getSchemaFromModelField() {
                         11
                     ];
                 case 4:
-                    if (!(_instanceof(field, _databases.TextField) || _instanceof(field, _databases.CharField) || _instanceof(field, _databases.UuidField))) return [
+                    if (!((fieldAsAny === null || fieldAsAny === void 0 ? void 0 : fieldAsAny['$$type']) === '$PTextField' || (fieldAsAny === null || fieldAsAny === void 0 ? void 0 : fieldAsAny['$$type']) === '$PCharField' || (fieldAsAny === null || fieldAsAny === void 0 ? void 0 : fieldAsAny['$$type']) === '$PUuidField')) return [
                         3,
                         5
                     ];
                     schema = (0, _string.string)();
                     if (field.allowBlank === false) schema = schema.minLength(1);
-                    if (_instanceof(field, _databases.CharField) && typeof field.maxLength === 'number') schema = schema.maxLength(field.maxLength);
-                    if (_instanceof(field, _databases.UuidField)) {
+                    if ((fieldAsAny === null || fieldAsAny === void 0 ? void 0 : fieldAsAny['$$type']) === '$PCharField' && typeof field.maxLength === 'number') schema = schema.maxLength(field.maxLength);
+                    if ((fieldAsAny === null || fieldAsAny === void 0 ? void 0 : fieldAsAny['$$type']) === '$PUuidField') {
                         schema = schema.uuid();
+                        // eslint-disable-next-line ts/no-unnecessary-condition
                         if (field.autoGenerate) schema = schema.optional();
                     }
                     return [
@@ -290,18 +283,19 @@ function _getSchemaFromModelField() {
                         11
                     ];
                 case 5:
-                    if (!_instanceof(field, _databases.DateField)) return [
+                    if (!((fieldAsAny === null || fieldAsAny === void 0 ? void 0 : fieldAsAny['$$type']) === '$PDateField')) return [
                         3,
                         6
                     ];
                     schema = (0, _datetime.datetime)().allowString();
+                    // eslint-disable-next-line ts/no-unnecessary-condition
                     if (field.autoNow || field.autoNowAdd) schema = schema.optional();
                     return [
                         3,
                         11
                     ];
                 case 6:
-                    if (!_instanceof(field, _databases.EnumField)) return [
+                    if (!((fieldAsAny === null || fieldAsAny === void 0 ? void 0 : fieldAsAny['$$type']) === '$PEnumField')) return [
                         3,
                         7
                     ];
@@ -326,18 +320,19 @@ function _getSchemaFromModelField() {
                         11
                     ];
                 case 7:
-                    if (!_instanceof(field, _databases.ForeignKeyField)) return [
+                    if (!((fieldAsAny === null || fieldAsAny === void 0 ? void 0 : fieldAsAny['$$type']) === '$PForeignKeyField')) return [
                         3,
                         10
                     ];
-                    doesADefinedFieldExistWithRelatedName = parent && field.relatedName && ((_parent___data = parent.__data) === null || _parent___data === void 0 ? void 0 : _parent___data[field.relatedName]);
-                    doesADefinedFieldExistWithRelationName = definedFields && field.relationName && definedFields[field.relationName];
-                    fieldWithRelatedName = doesADefinedFieldExistWithRelatedName ? (_parent___data1 = parent.__data) === null || _parent___data1 === void 0 ? void 0 : _parent___data1[field.relatedName] : undefined;
-                    fieldWithRelationName = doesADefinedFieldExistWithRelationName ? definedFields[field.relationName] : undefined;
-                    isFieldWithRelatedNameAModelField = _instanceof(fieldWithRelatedName, _schema1.Schema) && fieldWithRelatedName.__model !== undefined;
-                    isFieldWithRelationNameAModelField = _instanceof(fieldWithRelationName, _schema1.Schema) && fieldWithRelationName.__model !== undefined;
-                    relatedToModel = field.relatedTo;
-                    toField = field.toField;
+                    fieldAsForeignKey = field;
+                    doesADefinedFieldExistWithRelatedName = parent && fieldAsForeignKey.relatedName && ((_parent___data = parent.__data) === null || _parent___data === void 0 ? void 0 : _parent___data[fieldAsForeignKey.relatedName]);
+                    doesADefinedFieldExistWithRelationName = definedFields && fieldAsForeignKey.relationName && definedFields[fieldAsForeignKey.relationName];
+                    fieldWithRelatedName = doesADefinedFieldExistWithRelatedName ? (_parent___data1 = parent.__data) === null || _parent___data1 === void 0 ? void 0 : _parent___data1[fieldAsForeignKey.relatedName] : undefined;
+                    fieldWithRelationName = doesADefinedFieldExistWithRelationName ? definedFields[fieldAsForeignKey.relationName] : undefined;
+                    isFieldWithRelatedNameAModelField = (fieldWithRelatedName === null || fieldWithRelatedName === void 0 ? void 0 : fieldWithRelatedName['$$type']) === '$PSchema' && fieldWithRelatedName.__model !== undefined;
+                    isFieldWithRelationNameAModelField = (fieldWithRelationName === null || fieldWithRelationName === void 0 ? void 0 : fieldWithRelationName['$$type']) === '$PSchema' && fieldWithRelationName.__model !== undefined;
+                    relatedToModel = fieldAsForeignKey.relatedTo;
+                    toField = fieldAsForeignKey.toField;
                     if (!(Object.keys(model._initialized).length > 0)) return [
                         3,
                         9
@@ -354,20 +349,20 @@ function _getSchemaFromModelField() {
                         if ((typeof options === "undefined" ? "undefined" : _type_of(options)) !== 'object') options = {};
                         options.foreignKeyRelation = {
                             schema: parent,
-                            isArray: _instanceof(fieldWithRelatedName, _array.ArraySchema),
+                            isArray: fieldWithRelatedName['$$type'] === '$PArraySchema',
                             model: fieldWithRelatedName.__model,
-                            fieldToSearchOnModel: field.fieldName,
-                            fieldToGetFromData: field.toField,
-                            relationOrRelatedName: field.relatedName
+                            fieldToSearchOnModel: fieldAsForeignKey.fieldName,
+                            fieldToGetFromData: fieldAsForeignKey.toField,
+                            relationOrRelatedName: fieldAsForeignKey.relatedName
                         };
                     } else if (isFieldWithRelationNameAModelField) {
                         if ((typeof options === "undefined" ? "undefined" : _type_of(options)) !== 'object') options = {};
                         options.foreignKeyRelation = {
-                            isArray: _instanceof(fieldWithRelationName, _array.ArraySchema),
+                            isArray: fieldWithRelationName['$$type'] === '$PArraySchema',
                             model: fieldWithRelationName.__model,
-                            fieldToSearchOnModel: field.toField,
+                            fieldToSearchOnModel: fieldAsForeignKey.toField,
                             fieldToGetFromData: field.fieldName,
-                            relationOrRelatedName: field.relationName
+                            relationOrRelatedName: fieldAsForeignKey.relationName
                         };
                     }
                     return [
@@ -380,8 +375,9 @@ function _getSchemaFromModelField() {
                         11
                     ];
                 case 10:
-                    if (_instanceof(field, _databases.TranslatableField) && field.customAttributes.schema) {
-                        if (_instanceof(field.customAttributes.schema, _schema1.Schema) === false) throw new _exceptions.TranslatableFieldNotImplementedError(field.fieldName);
+                    if ((fieldAsAny === null || fieldAsAny === void 0 ? void 0 : fieldAsAny['$$type']) === '$PTranslatableField' && field.customAttributes.schema) {
+                        ;
+                        if (((_field_customAttributes_schema = field.customAttributes.schema) === null || _field_customAttributes_schema === void 0 ? void 0 : _field_customAttributes_schema['$$type']) === '$PSchema' === false) throw new _exceptions.TranslatableFieldNotImplementedError(field.fieldName);
                         schema = field.customAttributes.schema;
                     }
                     _state.label = 11;
@@ -435,7 +431,7 @@ function modelSchema(model, options) {
                                     ];
                                     schema = fieldsAsObject[key];
                                     optionsForForeignKeyRelation = {};
-                                    if (!(!schema || _instanceof(value, _databases.ForeignKeyField))) return [
+                                    if (!(!schema || (value === null || value === void 0 ? void 0 : value['$$type']) === '$PForeignKeyField')) return [
                                         3,
                                         2
                                     ];

package/dist/cjs/src/schema/array.js

@@ -353,6 +353,7 @@ var ArraySchema = /*#__PURE__*/ function(Schema) {
         _class_call_check(this, ArraySchema);
         var _this;
         _this = _super.call(this);
+        _define_property(_assert_this_initialized(_this), "$$type", '$PArraySchema');
         _define_property(_assert_this_initialized(_this), "fieldType", 'array');
         _define_property(_assert_this_initialized(_this), "__schemas", void 0);
         _define_property(_assert_this_initialized(_this), "__type", {

package/dist/cjs/src/schema/object.js

@@ -130,13 +130,6 @@ function _inherits(subClass, superClass) {
     });
     if (superClass) _set_prototype_of(subClass, superClass);
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
@@ -432,7 +425,8 @@ var ObjectSchema = /*#__PURE__*/ function(Schema) {
                                                                 return _ref.apply(this, arguments);
                                                             };
                                                         }();
-                                                        if (_instanceof(valueToTransform, _schema.Schema)) promises.push(awaitableTransformer());
+                                                        // eslint-disable-next-line ts/no-unnecessary-condition
+                                                        if ((valueToTransform === null || valueToTransform === void 0 ? void 0 : valueToTransform['$$type']) === '$PSchema') promises.push(awaitableTransformer());
                                                     };
                                                     for(_iterator = toTransform[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
                                                 } catch (err) {

package/dist/cjs/src/schema/schema.js

@@ -243,6 +243,7 @@ var Schema = /*#__PURE__*/ function() {
     "use strict";
     function Schema() {
         _class_call_check(this, Schema);
+        _define_property(this, "$$type", '$PSchema');
         _define_property(this, "fieldType", 'schema');
         // Those functions will assume control of the validation process on adapters, instead of the schema.
         // Why this is used? The idea is that the Schema has NO idea

package/dist/cjs/src/utils.js

@@ -34,7 +34,6 @@ _export(exports, {
         return withFallbackFactory;
     }
 });
-var _adapter = require("./adapter");
 var _conf = require("./conf");
 var _schema = require("./validators/schema");
 var _utils = require("./validators/utils");
@@ -96,13 +95,6 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _iterable_to_array(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -263,6 +255,7 @@ function _ts_generator(thisArg, body) {
 var WithFallback = function WithFallback(adapterType, fallbackFor, transformedSchema) {
     "use strict";
     _class_call_check(this, WithFallback);
+    _define_property(this, "$$type", '$PWithFallback');
     _define_property(this, "fallbackFor", void 0);
     _define_property(this, "transformedSchema", void 0);
     _define_property(this, "adapterType", void 0);
@@ -392,7 +385,9 @@ function _defaultTransform() {
                         }
                     };
                     appendRequiredFallbacks = function() {
-                        var hasFallbacks = _instanceof(schemaWithPrivateFields.__rootFallbacksValidator, _utils.Validator);
+                        var _schemaWithPrivateFields___rootFallbacksValidator;
+                        // eslint-disable-next-line ts/no-unnecessary-condition
+                        var hasFallbacks = ((_schemaWithPrivateFields___rootFallbacksValidator = schemaWithPrivateFields.__rootFallbacksValidator) === null || _schemaWithPrivateFields___rootFallbacksValidator === void 0 ? void 0 : _schemaWithPrivateFields___rootFallbacksValidator['$$type']) === '$PValidator';
                         if (hasFallbacks) {
                             _utils.Validator.createAndAppendFallback(schema, (0, _schema.optional)(schemaWithPrivateFields.__optional));
                             _utils.Validator.createAndAppendFallback(schema, (0, _schema.nullable)(schemaWithPrivateFields.__nullable));
@@ -472,7 +467,8 @@ function _defaultTransform() {
                     stringVersion = _state.sent();
                     _state.label = 7;
                 case 7:
-                    if (_instanceof(translatedSchemaOrWithFallback, WithFallback)) {
+                    // eslint-disable-next-line ts/no-unnecessary-condition
+                    if ((translatedSchemaOrWithFallback === null || translatedSchemaOrWithFallback === void 0 ? void 0 : translatedSchemaOrWithFallback['$$type']) === '$PWithFallback') {
                         appendRootFallback();
                         _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = undefined;
                         try {
@@ -527,20 +523,22 @@ function defaultTransformToAdapter(callback, schema, transformedSchemas, options
 }
 function _defaultTransformToAdapter() {
     _defaultTransformToAdapter = _async_to_generator(function(callback, schema, transformedSchemas, options, type) {
-        var _options_schemaAdapter, isTransformedSchemasEmpty, adapterInstanceToUse, schemaAdapterNameToUse, isACustomSchemaAdapterAndNotYetDefined, shouldTranslate, translatedSchemas;
+        var _options_schemaAdapter, isTransformedSchemasEmpty, // eslint-disable-next-line ts/no-unnecessary-condition
+        _options_schemaAdapter1, adapterInstanceToUse, schemaAdapterNameToUse, isACustomSchemaAdapterAndNotYetDefined, shouldTranslate, translatedSchemas;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     isTransformedSchemasEmpty = Object.keys(transformedSchemas).length <= 0;
                     if (isTransformedSchemasEmpty) {
-                        adapterInstanceToUse = _instanceof(options.schemaAdapter, _adapter.SchemaAdapter) ? options.schemaAdapter : (0, _conf.getDefaultAdapter)();
-                        schema['__transformedSchemas'][adapterInstanceToUse.constructor.name] = {
+                        ;
+                        adapterInstanceToUse = ((_options_schemaAdapter1 = options.schemaAdapter) === null || _options_schemaAdapter1 === void 0 ? void 0 : _options_schemaAdapter1['$$type']) === '$PSchemaAdapter' ? options.schemaAdapter : (0, _conf.getDefaultAdapter)();
+                        schema['__transformedSchemas'][adapterInstanceToUse.name] = {
                             transformed: false,
                             adapter: adapterInstanceToUse,
                             schemas: []
                         };
                     }
-                    schemaAdapterNameToUse = ((_options_schemaAdapter = options.schemaAdapter) === null || _options_schemaAdapter === void 0 ? void 0 : _options_schemaAdapter.constructor.name) || Object.keys(transformedSchemas)[0];
+                    schemaAdapterNameToUse = ((_options_schemaAdapter = options.schemaAdapter) === null || _options_schemaAdapter === void 0 ? void 0 : _options_schemaAdapter.name) || Object.keys(transformedSchemas)[0];
                     isACustomSchemaAdapterAndNotYetDefined = // eslint-disable-next-line ts/no-unnecessary-condition
                     transformedSchemas[schemaAdapterNameToUse] === undefined && options.schemaAdapter !== undefined;
                     if (isACustomSchemaAdapterAndNotYetDefined) transformedSchemas[schemaAdapterNameToUse] = {

package/dist/cjs/src/validators/utils.js

@@ -263,6 +263,7 @@ var Validator = /*#__PURE__*/ function() {
     "use strict";
     function Validator(type) {
         _class_call_check(this, Validator);
+        _define_property(this, "$$type", '$PValidator');
         _define_property(this, "child", void 0);
         _define_property(this, "parent", void 0);
         _define_property(this, "fallbackNamesAdded", new Set());