@strapi/types 5.0.0-alpha.5 → 5.0.0-alpha.7

package/dist/modules/entity-service/params/data.d.ts

@@ -1,4 +1,4 @@
-import type { Common } from '../../../types';
+import type * as UID from '../../../uid';
 import type * as AttributeUtils from './attributes';
-export type Input<TSchemaUID extends Common.UID.Schema> = AttributeUtils.GetValues<TSchemaUID>;
+export type Input<TSchemaUID extends UID.Schema> = AttributeUtils.GetValues<TSchemaUID>;
 //# sourceMappingURL=data.d.ts.map

package/dist/modules/entity-service/params/data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../../src/modules/entity-service/params/data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,KAAK,cAAc,MAAM,cAAc,CAAC;AAEpD,MAAM,MAAM,KAAK,CAAC,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,cAAc,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../../src/modules/entity-service/params/data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,KAAK,cAAc,MAAM,cAAc,CAAC;AAEpD,MAAM,MAAM,KAAK,CAAC,UAAU,SAAS,GAAG,CAAC,MAAM,IAAI,cAAc,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC"}

package/dist/modules/entity-service/params/fields.d.ts

@@ -1,4 +1,6 @@
-import type { Attribute, Common, Utils } from '../../../types';
+import type * as Schema from '../../../schema';
+import type * as UID from '../../../uid';
+import type { Guard } from '../../../utils';
 /**
  * Wildcard notation for the fields.
  *
@@ -14,7 +16,7 @@ export type WildcardNotation = '*';
  * type C = 'populatableField'; // ❌
  * type D = '<random_string>'; // ❌
  */
-export type SingleAttribute<TSchemaUID extends Common.UID.Schema> = 'id' | Utils.Guard.Never<Attribute.GetNonPopulatableKeys<TSchemaUID>, string>;
+export type SingleAttribute<TSchemaUID extends UID.Schema> = 'id' | Guard.Never<Schema.NonPopulatableAttributeNames<TSchemaUID>, string>;
 /**
  * Union of all possible string representation for fields
  *
@@ -26,7 +28,7 @@ export type SingleAttribute<TSchemaUID extends Common.UID.Schema> = 'id' | Utils
  * type E = 'populatableField'; // ❌
  * type F = '<random_string>'; // ❌
  */
-export type StringNotation<TSchemaUID extends Common.UID.Schema> = WildcardNotation | SingleAttribute<TSchemaUID> | `${string},${string}`;
+export type StringNotation<TSchemaUID extends UID.Schema> = WildcardNotation | SingleAttribute<TSchemaUID> | `${string},${string}`;
 /**
  * Array notation for fields
  *
@@ -38,7 +40,7 @@ export type StringNotation<TSchemaUID extends Common.UID.Schema> = WildcardNotat
  * type F = ['populatableField']; // ❌
  * type G = ['<random_string>']; // ❌
  */
-export type ArrayNotation<TSchemaUID extends Common.UID.Schema> = Exclude<StringNotation<TSchemaUID>, WildcardNotation>[];
+export type ArrayNotation<TSchemaUID extends UID.Schema> = Exclude<StringNotation<TSchemaUID>, WildcardNotation>[];
 /**
  * Represents any notation for a sort (string, array, object)
  *
@@ -55,5 +57,5 @@ export type ArrayNotation<TSchemaUID extends Common.UID.Schema> = Exclude<String
  * type J = 'populatableField'; // ❌
  * type K = '<random_string>'; // ❌
  */
-export type Any<TSchemaUID extends Common.UID.Schema> = StringNotation<TSchemaUID> | ArrayNotation<TSchemaUID>;
+export type Any<TSchemaUID extends UID.Schema> = StringNotation<TSchemaUID> | ArrayNotation<TSchemaUID>;
 //# sourceMappingURL=fields.d.ts.map

package/dist/modules/entity-service/params/fields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fields.d.ts","sourceRoot":"","sources":["../../../../src/modules/entity-service/params/fields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE/D;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAEnC;;;;;;;;GAQG;AACH,MAAM,MAAM,eAAe,CAAC,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,MAAM,IAC5D,IAAI,GACJ,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;AAE3E;;;;;;;;;;GAUG;AACH,MAAM,MAAM,cAAc,CAAC,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,MAAM,IAC3D,gBAAgB,GAChB,eAAe,CAAC,UAAU,CAAC,GAE3B,GAAG,MAAM,IAAI,MAAM,EAAE,CAAC;AAE1B;;;;;;;;;;GAUG;AACH,MAAM,MAAM,aAAa,CAAC,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,OAAO,CACvE,cAAc,CAAC,UAAU,CAAC,EAC1B,gBAAgB,CACjB,EAAE,CAAC;AAEJ;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,GAAG,CAAC,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,MAAM,IAChD,cAAc,CAAC,UAAU,CAAC,GAC1B,aAAa,CAAC,UAAU,CAAC,CAAC"}
+{"version":3,"file":"fields.d.ts","sourceRoot":"","sources":["../../../../src/modules/entity-service/params/fields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAE/C,OAAO,KAAK,KAAK,GAAG,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAEnC;;;;;;;;GAQG;AACH,MAAM,MAAM,eAAe,CAAC,UAAU,SAAS,GAAG,CAAC,MAAM,IACrD,IAAI,GACJ,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,4BAA4B,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;AAEzE;;;;;;;;;;GAUG;AACH,MAAM,MAAM,cAAc,CAAC,UAAU,SAAS,GAAG,CAAC,MAAM,IACpD,gBAAgB,GAChB,eAAe,CAAC,UAAU,CAAC,GAE3B,GAAG,MAAM,IAAI,MAAM,EAAE,CAAC;AAE1B;;;;;;;;;;GAUG;AACH,MAAM,MAAM,aAAa,CAAC,UAAU,SAAS,GAAG,CAAC,MAAM,IAAI,OAAO,CAChE,cAAc,CAAC,UAAU,CAAC,EAC1B,gBAAgB,CACjB,EAAE,CAAC;AAEJ;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,GAAG,CAAC,UAAU,SAAS,GAAG,CAAC,MAAM,IACzC,cAAc,CAAC,UAAU,CAAC,GAC1B,aAAa,CAAC,UAAU,CAAC,CAAC"}

package/dist/modules/entity-service/params/filters/index.d.ts

@@ -1,4 +1,6 @@
-import type { Attribute, Common, Utils } from '../../../../types';
+import type * as Schema from '../../../../schema';
+import type * as UID from '../../../../uid';
+import type { Constants, Guard, Cast, If, MatchFirst, StrictEqual, IsNotNever } from '../../../../utils';
 import type * as Operator from './operators';
 import type * as AttributeUtils from '../attributes';
 import type * as Params from '..';
@@ -8,21 +10,21 @@ type IDKey = 'id';
  * Generic object notation for filters.
  * @template TSchemaUID The type of the schema UID for the object notation.
  */
-export type Any<TSchemaUID extends Common.UID.Schema> = ObjectNotation<TSchemaUID>;
+export type Any<TSchemaUID extends UID.Schema> = ObjectNotation<TSchemaUID>;
 /**
  * Type that unites root-level operators and attributes filtering for a specific schema query.
  *
  * It is used to define the structure of filters objects in a specific schema.
  * @template TSchemaUID The UID of the schema defining the object notation.
  */
-export type ObjectNotation<TSchemaUID extends Common.UID.Schema> = TSchemaUID extends infer TUIDs extends Common.UID.Schema ? {
+export type ObjectNotation<TSchemaUID extends UID.Schema> = TSchemaUID extends infer TUIDs extends UID.Schema ? {
     [TUID in TUIDs]: RootLevelOperatorFiltering<TUID> & AttributesFiltering<TUID>;
 }[TSchemaUID] : never;
 /**
  * Object for root level operator filtering.
  * @template TSchemaUID - The type of the schema UID.
  */
-export type RootLevelOperatorFiltering<TSchemaUID extends Common.UID.Schema> = {
+export type RootLevelOperatorFiltering<TSchemaUID extends UID.Schema> = {
     [TIter in Operator.Group]?: ObjectNotation<TSchemaUID>[];
 } & {
     [TIter in Operator.Logical]?: ObjectNotation<TSchemaUID>;
@@ -31,20 +33,20 @@ export type RootLevelOperatorFiltering<TSchemaUID extends Common.UID.Schema> = {
  * Represents a type for filtering on attributes based on a given schema.
  *  @template TSchemaUID - The UID of the schema.
  */
-export type AttributesFiltering<TSchemaUID extends Common.UID.Schema> = IDFiltering & Utils.Expression.If<Common.AreSchemaRegistriesExtended, ScalarAttributesFiltering<TSchemaUID> & NestedAttributeFiltering<TSchemaUID>, AbstractAttributesFiltering<TSchemaUID>>;
+export type AttributesFiltering<TSchemaUID extends UID.Schema> = IDFiltering & If<Constants.AreSchemaRegistriesExtended, ScalarAttributesFiltering<TSchemaUID> & NestedAttributeFiltering<TSchemaUID>, AbstractAttributesFiltering<TSchemaUID>>;
 /**
  * Definition of scalar attribute filtering for a given schema UID.
  * @template TSchemaUID - The UID of the schema.
  */
-export type ScalarAttributesFiltering<TSchemaUID extends Common.UID.Schema> = {
+export type ScalarAttributesFiltering<TSchemaUID extends UID.Schema> = {
     [TKey in AttributeUtils.GetScalarKeys<TSchemaUID>]?: AttributeCondition<TSchemaUID, TKey>;
 };
 /**
  * Filters object for nested schema attributes.
  * @template TSchemaUID - The UID of the schema to perform filtering on.
  */
-export type NestedAttributeFiltering<TSchemaUID extends Common.UID.Schema> = {
-    [TKey in AttributeUtils.GetNestedKeys<TSchemaUID>]?: ObjectNotation<Attribute.GetTarget<TSchemaUID, TKey>>;
+export type NestedAttributeFiltering<TSchemaUID extends UID.Schema> = {
+    [TKey in AttributeUtils.GetNestedKeys<TSchemaUID>]?: ObjectNotation<Schema.Attribute.Target<Schema.AttributeByName<TSchemaUID, TKey>>>;
 };
 type IDFiltering = {
     id?: AttributeCondition<never, IDKey>;
@@ -54,7 +56,7 @@ type IDFiltering = {
  * @template TSchemaUID - The unique identifier of the schema.
  * @template TAttributeName - The name of the attribute.
  */
-type AttributeCondition<TSchemaUID extends Common.UID.Schema, TAttributeName extends IDKey | AttributeUtils.GetScalarKeys<TSchemaUID>> = GetScalarAttributeValue<TSchemaUID, TAttributeName> extends infer TAttributeValue ? TAttributeValue | ({
+type AttributeCondition<TSchemaUID extends UID.Schema, TAttributeName extends IDKey | AttributeUtils.GetScalarKeys<TSchemaUID>> = GetScalarAttributeValue<TSchemaUID, TAttributeName> extends infer TAttributeValue ? TAttributeValue | ({
     [TIter in Operator.BooleanValue]?: boolean;
 } & {
     [TIter in Operator.DynamicValue]?: TAttributeValue;
@@ -72,14 +74,14 @@ type AttributeCondition<TSchemaUID extends Common.UID.Schema, TAttributeName ext
  * @template TSchemaUID The UID type of the schema.
  * @template TAttributeName The name of the attribute.
  */
-type GetScalarAttributeValue<TSchemaUID extends Common.UID.Schema, TAttributeName extends IDKey | AttributeUtils.GetScalarKeys<TSchemaUID>> = Utils.Expression.MatchFirst<[
+type GetScalarAttributeValue<TSchemaUID extends UID.Schema, TAttributeName extends IDKey | AttributeUtils.GetScalarKeys<TSchemaUID>> = MatchFirst<[
     [
-        Utils.Expression.StrictEqual<TAttributeName, IDKey>,
+        StrictEqual<TAttributeName, IDKey>,
         Params.Attribute.ID
     ],
     [
-        Utils.Expression.IsNotNever<TAttributeName>,
-        AttributeUtils.GetValue<Attribute.Get<TSchemaUID, Utils.Cast<TAttributeName, AttributeUtils.GetScalarKeys<TSchemaUID>>>>
+        IsNotNever<TAttributeName>,
+        AttributeUtils.GetValue<Schema.AttributeByName<TSchemaUID, Cast<TAttributeName, AttributeUtils.GetScalarKeys<TSchemaUID>>>>
     ]
 ], AttributeUtils.ScalarValues>;
 /**
@@ -87,8 +89,8 @@ type GetScalarAttributeValue<TSchemaUID extends Common.UID.Schema, TAttributeNam
  * @template TSchemaUID - The (literal) UID of the schema.
  * @template TAttributeName - The attribute name in the schema.
  */
-type NestedAttributeCondition<TSchemaUID extends Common.UID.Schema, TAttributeName extends Attribute.GetKeys<TSchemaUID>> = ObjectNotation<Utils.Guard.Never<Attribute.GetTarget<TSchemaUID, TAttributeName>, Common.UID.Schema>>;
-export type AbstractAttributesFiltering<TSchemaUID extends Common.UID.Schema> = {
+type NestedAttributeCondition<TSchemaUID extends UID.Schema, TAttributeName extends Schema.AttributeNames<TSchemaUID>> = ObjectNotation<Guard.Never<Schema.Attribute.Target<Schema.AttributeByName<TSchemaUID, TAttributeName>>, UID.Schema>>;
+export type AbstractAttributesFiltering<TSchemaUID extends UID.Schema> = {
     [TKey in string]?: AttributeCondition<TSchemaUID, never> | NestedAttributeCondition<TSchemaUID, never>;
 };
 //# sourceMappingURL=index.d.ts.map

package/dist/modules/entity-service/params/filters/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/modules/entity-service/params/filters/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/modules/entity-service/params/filters/index.ts"],"names":[],"mappings":"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"}

package/dist/modules/entity-service/params/index.d.ts

@@ -1,4 +1,5 @@
-import type { Common, Utils } from '../../../types';
+import type * as UID from '../../../uid';
+import type { Extends, MatchAllIntersect } from '../../../utils';
 import type { GetPluginParams } from '..';
 import type * as Sort from './sort';
 import type * as Pagination from './pagination';
@@ -8,7 +9,7 @@ import type * as Populate from './populate';
 import type * as Data from './data';
 import type * as Search from './search';
 import type * as Attribute from './attributes';
-export type Pick<TSchemaUID extends Common.UID.Schema, TKind extends Kind> = Utils.Expression.MatchAllIntersect<[
+export type Pick<TSchemaUID extends UID.Schema, TKind extends Kind> = MatchAllIntersect<[
     [
         HasMember<TKind, 'sort'>,
         {
@@ -117,6 +118,6 @@ export type Pick<TSchemaUID extends Common.UID.Schema, TKind extends Kind> = Uti
     ]
 ]>;
 export type Kind = 'sort' | 'sort:string' | 'sort:array' | 'sort:object' | 'fields' | 'fields:string' | 'fields:array' | 'filters' | 'populate' | 'populate:string' | 'populate:array' | 'populate:object' | 'pagination' | 'pagination:offset' | 'pagination:page' | 'plugin' | 'data' | 'data:partial' | 'files' | '_q';
-type HasMember<TValue extends Kind, TTest extends Kind> = Utils.Expression.Extends<TTest, TValue>;
+type HasMember<TValue extends Kind, TTest extends Kind> = Extends<TTest, TValue>;
 export type { Sort, Pagination, Fields, Filters, Populate, Data, Attribute };
 //# sourceMappingURL=index.d.ts.map

package/dist/modules/entity-service/params/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/entity-service/params/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAE1C,OAAO,KAAK,KAAK,IAAI,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,KAAK,UAAU,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,KAAK,MAAM,MAAM,UAAU,CAAC;AACxC,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,KAAK,QAAQ,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,KAAK,IAAI,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,KAAK,MAAM,MAAM,UAAU,CAAC;AAGxC,OAAO,KAAK,KAAK,SAAS,MAAM,cAAc,CAAC;AAE/C,MAAM,MAAM,IAAI,CACd,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,MAAM,EACpC,KAAK,SAAS,IAAI,IAChB,KAAK,CAAC,UAAU,CAAC,iBAAiB,CACpC;IAEE;QAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;QAAE;YAAE,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;SAAE;KAAC;IAC3D;QAAC,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC;QAAE;YAAE,IAAI,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;SAAE;KAAC;IAC7E;QAAC,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC;QAAE;YAAE,IAAI,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA;SAAE;KAAC;IAC3E;QAAC,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC;QAAE;YAAE,IAAI,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;SAAE;KAAC;IAE7E;QAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC;QAAE;YAAE,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;SAAE;KAAC;IACjE;QAAC,SAAS,CAAC,KAAK,EAAE,eAAe,CAAC;QAAE;YAAE,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;SAAE;KAAC;IACnF;QAAC,SAAS,CAAC,KAAK,EAAE,cAAc,CAAC;QAAE;YAAE,MAAM,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA;SAAE;KAAC;IAEjF;QAAC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC;QAAE;YAAE,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;SAAE;KAAC;IAEpE;QAAC,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC;QAAE;YAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;SAAE;KAAC;IACvE;QAAC,SAAS,CAAC,KAAK,EAAE,iBAAiB,CAAC;QAAE;YAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;SAAE;KAAC;IACzF;QAAC,SAAS,CAAC,KAAK,EAAE,gBAAgB,CAAC;QAAE;YAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA;SAAE;KAAC;IACvF;QAAC,SAAS,CAAC,KAAK,EAAE,iBAAiB,CAAC;QAAE;YAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;SAAE;KAAC;IAEzF;QAAC,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC;QAAE,UAAU,CAAC,GAAG;KAAC;IAChD;QAAC,SAAS,CAAC,KAAK,EAAE,mBAAmB,CAAC;QAAE,UAAU,CAAC,cAAc;KAAC;IAClE;QAAC,SAAS,CAAC,KAAK,EAAE,iBAAiB,CAAC;QAAE,UAAU,CAAC,YAAY;KAAC;IAE9D;QAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC;QAAE,eAAe,CAAC,UAAU,CAAC;KAAC;IAEzD;QAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;QAAE;YAAE,IAAI,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;SAAE;KAAC;IAC7D;QAAC,SAAS,CAAC,KAAK,EAAE,cAAc,CAAC;QAAE;YAAE,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;SAAE;KAAC;IAE9E;QAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC;QAAE;YAAE,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;SAAE;KAAC;CAC5C,CACF,CAAC;AAEF,MAAM,MAAM,IAAI,GACZ,MAAM,GACN,aAAa,GACb,YAAY,GACZ,aAAa,GACb,QAAQ,GACR,eAAe,GACf,cAAc,GACd,SAAS,GACT,UAAU,GACV,iBAAiB,GACjB,gBAAgB,GAChB,iBAAiB,GACjB,YAAY,GACZ,mBAAmB,GACnB,iBAAiB,GACjB,QAAQ,GACR,MAAM,GACN,cAAc,GACd,OAAO,GACP,IAAI,CAAC;AAET,KAAK,SAAS,CAAC,MAAM,SAAS,IAAI,EAAE,KAAK,SAAS,IAAI,IAAI,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAElG,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/entity-service/params/index.ts"],"names":[],"mappings":"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"}

package/dist/modules/entity-service/params/pagination.d.ts

@@ -1,4 +1,3 @@
-import type { Utils } from '../../../types';
 export type PageNotation = {
     page?: number;
     pageSize?: number;
@@ -7,5 +6,5 @@ export type OffsetNotation = {
     start?: number;
     limit?: number;
 };
-export type Any = Utils.XOR<PageNotation, OffsetNotation>;
+export type Any = PageNotation | OffsetNotation;
 //# sourceMappingURL=pagination.d.ts.map

package/dist/modules/entity-service/params/pagination.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pagination.d.ts","sourceRoot":"","sources":["../../../../src/modules/entity-service/params/pagination.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC"}
+{"version":3,"file":"pagination.d.ts","sourceRoot":"","sources":["../../../../src/modules/entity-service/params/pagination.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,GAAG,GAAG,YAAY,GAAG,cAAc,CAAC"}

package/dist/modules/entity-service/params/populate.d.ts

@@ -1,4 +1,6 @@
-import type { Attribute, Common, Utils } from '../../../types';
+import type * as Schema from '../../../schema';
+import type * as UID from '../../../uid';
+import type { Constants, Guard, If, And, DoesNotExtends, IsNotNever } from '../../../utils';
 import type { Params } from '..';
 /**
  * Wildcard notation for populate
@@ -16,7 +18,7 @@ export type WildcardNotation = '*';
  * type D = 'populatableField'; // ✅
  * type E = '<random_string>'; // ❌
  */
-export type StringNotation<TSchemaUID extends Common.UID.Schema> = WildcardNotation | Utils.Guard.Never<Attribute.GetPopulatableKeys<TSchemaUID>, string> | `${string},${string}` | `${string}.${string}`;
+export type StringNotation<TSchemaUID extends UID.Schema> = WildcardNotation | Guard.Never<Schema.PopulatableAttributeNames<TSchemaUID>, string> | `${string},${string}` | `${string}.${string}`;
 /**
  * Array notation for populate
  *
@@ -27,19 +29,19 @@ export type StringNotation<TSchemaUID extends Common.UID.Schema> = WildcardNotat
  * type D = ['<random_string>']; // ❌
  * type E = ['*']; // ❌
  */
-export type ArrayNotation<TSchemaUID extends Common.UID.Schema> = Exclude<StringNotation<TSchemaUID>, WildcardNotation>[];
-type GetPopulatableKeysWithTarget<TSchemaUID extends Common.UID.Schema> = Extract<Attribute.GetPopulatableKeys<TSchemaUID>, Attribute.GetKeysWithTarget<TSchemaUID>>;
-type GetPopulatableKeysWithoutTarget<TSchemaUID extends Common.UID.Schema> = Exclude<Attribute.GetPopulatableKeys<TSchemaUID>, GetPopulatableKeysWithTarget<TSchemaUID>>;
+export type ArrayNotation<TSchemaUID extends UID.Schema> = Exclude<StringNotation<TSchemaUID>, WildcardNotation>[];
+type GetPopulatableKeysWithTarget<TSchemaUID extends UID.Schema> = Extract<Schema.PopulatableAttributeNames<TSchemaUID>, Schema.AttributeNamesWithTarget<TSchemaUID>>;
+type GetPopulatableKeysWithoutTarget<TSchemaUID extends UID.Schema> = Exclude<Schema.PopulatableAttributeNames<TSchemaUID>, GetPopulatableKeysWithTarget<TSchemaUID>>;
 /**
  * Fragment populate notation for polymorphic attributes
  */
-export type Fragment<TMaybeTargets extends Common.UID.Schema> = {
+export type Fragment<TMaybeTargets extends UID.Schema> = {
     on?: {
-        [key: string]: boolean | NestedParams<TMaybeTargets>;
+        [TKey in TMaybeTargets]: boolean | NestedParams<TKey>;
     };
 };
-type PopulateClause<TSchemaUID extends Common.UID.Schema, TKeys extends Attribute.GetPopulatableKeys<TSchemaUID>> = {
-    [TKey in TKeys]?: boolean | NestedParams<Attribute.GetTarget<TSchemaUID, TKey>>;
+type PopulateClause<TSchemaUID extends UID.Schema, TKeys extends Schema.PopulatableAttributeNames<TSchemaUID>> = {
+    [TKey in TKeys]?: boolean | NestedParams<Schema.Attribute.Target<Schema.AttributeByName<TSchemaUID, TKey>>>;
 };
 /**
  * Object notation for populate
@@ -50,20 +52,20 @@ type PopulateClause<TSchemaUID extends Common.UID.Schema, TKeys extends Attribut
  * type C = { populatableField: { populate: { nestedPopulatableField: true } } }; // ✅
  * type D = { dynamic_zone: { on: { comp_A: { fields: ['name', 'price_a'] }, comp_B: { fields: ['name', 'price_b'] } } } }; // ✅
  */
-export type ObjectNotation<TSchemaUID extends Common.UID.Schema> = [
+export type ObjectNotation<TSchemaUID extends UID.Schema> = [
     GetPopulatableKeysWithTarget<TSchemaUID>,
     GetPopulatableKeysWithoutTarget<TSchemaUID>
 ] extends [
-    infer TKeysWithTarget extends Attribute.GetPopulatableKeys<TSchemaUID>,
-    infer TKeysWithoutTarget extends Attribute.GetPopulatableKeys<TSchemaUID>
-] ? Utils.Expression.If<Utils.Expression.And<Common.AreSchemaRegistriesExtended, Utils.Expression.DoesNotExtends<Common.UID.Schema, TSchemaUID>>, Utils.Expression.If<Utils.Expression.IsNotNever<TKeysWithTarget>, PopulateClause<TSchemaUID, TKeysWithTarget>> | Utils.Expression.If<Utils.Expression.IsNotNever<TKeysWithoutTarget>, {
-    [TKey in TKeysWithoutTarget]?: boolean | Fragment<Utils.Guard.Never<Attribute.GetMorphTargets<TSchemaUID, TKey>, Common.UID.Schema>> | NestedParams<Common.UID.Schema>;
+    infer TKeysWithTarget extends Schema.PopulatableAttributeNames<TSchemaUID>,
+    infer TKeysWithoutTarget extends Schema.PopulatableAttributeNames<TSchemaUID>
+] ? If<And<Constants.AreSchemaRegistriesExtended, DoesNotExtends<UID.Schema, TSchemaUID>>, If<IsNotNever<TKeysWithTarget>, PopulateClause<TSchemaUID, TKeysWithTarget>> | If<IsNotNever<TKeysWithoutTarget>, {
+    [TKey in TKeysWithoutTarget]?: boolean | Fragment<Guard.Never<Schema.Attribute.MorphTargets<Schema.AttributeByName<TSchemaUID, TKey>>, UID.Schema>> | NestedParams<UID.Schema>;
 }>, {
-    [key: string]: boolean | NestedParams<Common.UID.Schema>;
+    [key: string]: boolean | NestedParams<UID.Schema>;
 } | {
-    [key: string]: boolean | Fragment<Common.UID.Schema> | NestedParams<Common.UID.Schema>;
+    [key: string]: boolean | Fragment<UID.Schema> | NestedParams<UID.Schema>;
 }> : never;
-export type NestedParams<TSchemaUID extends Common.UID.Schema> = Params.Pick<TSchemaUID, 'fields' | 'filters' | 'populate' | 'sort' | 'plugin'>;
-export type Any<TSchemaUID extends Common.UID.Schema> = StringNotation<TSchemaUID> | ArrayNotation<TSchemaUID> | ObjectNotation<TSchemaUID>;
+export type NestedParams<TSchemaUID extends UID.Schema> = Params.Pick<TSchemaUID, 'fields' | 'filters' | 'populate' | 'sort' | 'plugin'>;
+export type Any<TSchemaUID extends UID.Schema> = StringNotation<TSchemaUID> | ArrayNotation<TSchemaUID> | ObjectNotation<TSchemaUID>;
 export {};
 //# sourceMappingURL=populate.d.ts.map

package/dist/modules/entity-service/params/populate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../../../src/modules/entity-service/params/populate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../../../src/modules/entity-service/params/populate.ts"],"names":[],"mappings":"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"}

package/dist/modules/entity-service/params/sort.d.ts

@@ -1,4 +1,6 @@
-import type { Attribute, Common, Utils } from '../../../types';
+import type * as Schema from '../../../schema';
+import type * as UID from '../../../uid';
+import type { Constants, Guard, If } from '../../../utils';
 export declare namespace OrderKind {
     type Asc = 'asc';
     type Desc = 'desc';
@@ -13,7 +15,7 @@ export declare namespace OrderKind {
  * type C = 'title:asc'; // ❌
  * type D = 'title,description'; // ❌
  */
-type SingleAttribute<TSchemaUID extends Common.UID.Schema> = 'id' | Utils.Guard.Never<string & Attribute.GetNonPopulatableKeys<TSchemaUID>, string>;
+type SingleAttribute<TSchemaUID extends UID.Schema> = 'id' | Guard.Never<string & Schema.NonPopulatableAttributeNames<TSchemaUID>, string>;
 /**
  * Ordered single non-populatable attribute representation
  *
@@ -23,7 +25,7 @@ type SingleAttribute<TSchemaUID extends Common.UID.Schema> = 'id' | Utils.Guard.
  * type C = 'title'; // ❌
  * type D = 'title,description'; // ❌
  */
-type OrderedSingleAttribute<TSchemaUID extends Common.UID.Schema> = `${SingleAttribute<TSchemaUID>}:${OrderKind.Any}`;
+type OrderedSingleAttribute<TSchemaUID extends UID.Schema> = `${SingleAttribute<TSchemaUID>}:${OrderKind.Any}`;
 /**
  * Union of all possible string representation for a sort
  *
@@ -35,7 +37,7 @@ type OrderedSingleAttribute<TSchemaUID extends Common.UID.Schema> = `${SingleAtt
  * type E = [42]; // ❌
  * type F = { title: 'asc' }; // ❌
  */
-export type StringNotation<TSchemaUID extends Common.UID.Schema> = SingleAttribute<TSchemaUID> | OrderedSingleAttribute<TSchemaUID> | `${string},${string}`;
+export type StringNotation<TSchemaUID extends UID.Schema> = SingleAttribute<TSchemaUID> | OrderedSingleAttribute<TSchemaUID> | `${string},${string}`;
 /**
  * Array notation for a sort
  *
@@ -47,7 +49,7 @@ export type StringNotation<TSchemaUID extends Common.UID.Schema> = SingleAttribu
  * type E = [42]; // ❌
  * type F = 'title'; // ❌
  */
-export type ArrayNotation<TSchemaUID extends Common.UID.Schema> = StringNotation<TSchemaUID>[] | ObjectNotation<TSchemaUID>[];
+export type ArrayNotation<TSchemaUID extends UID.Schema> = StringNotation<TSchemaUID>[] | ObjectNotation<TSchemaUID>[];
 /**
  * Object notation for a sort
  *
@@ -59,8 +61,8 @@ export type ArrayNotation<TSchemaUID extends Common.UID.Schema> = StringNotation
  * type E = ['title']; // ❌
  * type F = 'title'; // ❌
  */
-export type ObjectNotation<TSchemaUID extends Common.UID.Schema> = Utils.Expression.If<Common.AreSchemaRegistriesExtended, {
-    [TKey in ObjectNotationKeys<TSchemaUID>]?: TKey extends SingleAttribute<TSchemaUID> ? OrderKind.Any : TKey extends Attribute.GetKeysWithTarget<TSchemaUID> ? ObjectNotation<Attribute.GetTarget<TSchemaUID, TKey>> : never;
+export type ObjectNotation<TSchemaUID extends UID.Schema> = If<Constants.AreSchemaRegistriesExtended, {
+    [TKey in ObjectNotationKeys<TSchemaUID>]?: TKey extends SingleAttribute<TSchemaUID> ? OrderKind.Any : TKey extends Schema.AttributeNamesWithTarget<TSchemaUID> ? ObjectNotation<Schema.Attribute.Target<Schema.AttributeByName<TSchemaUID, TKey>>> : never;
 }, {
     [key: string]: OrderKind.Any | ObjectNotation<TSchemaUID>;
 }>;
@@ -71,7 +73,7 @@ export type ObjectNotation<TSchemaUID extends Common.UID.Schema> = Utils.Express
  *
  * This means that every member of ObjectNotationKeys can represent either a single non-populatable attribute or an attribute with a target.
  */
-type ObjectNotationKeys<TSchemaUID extends Common.UID.Schema> = SingleAttribute<TSchemaUID> | Attribute.GetKeysWithTarget<TSchemaUID>;
+type ObjectNotationKeys<TSchemaUID extends UID.Schema> = SingleAttribute<TSchemaUID> | Schema.AttributeNamesWithTarget<TSchemaUID>;
 /**
  * Represents any notation for a sort (string, array, object)
  *
@@ -88,6 +90,6 @@ type ObjectNotationKeys<TSchemaUID extends Common.UID.Schema> = SingleAttribute<
  * type J = { title: 'asc', author: { name: 'asc' } }; // ✅
  * type K = { author: { email: 'asc', role: { name: 'desc' } } }; // ✅
  */
-export type Any<TSchemaUID extends Common.UID.Schema> = StringNotation<TSchemaUID> | ArrayNotation<TSchemaUID> | ObjectNotation<TSchemaUID>;
+export type Any<TSchemaUID extends UID.Schema> = StringNotation<TSchemaUID> | ArrayNotation<TSchemaUID> | ObjectNotation<TSchemaUID>;
 export {};
 //# sourceMappingURL=sort.d.ts.map

package/dist/modules/entity-service/params/sort.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sort.d.ts","sourceRoot":"","sources":["../../../../src/modules/entity-service/params/sort.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAG/D,yBAAiB,SAAS,CAAC;IACzB,KAAY,GAAG,GAAG,KAAK,CAAC;IACxB,KAAY,IAAI,GAAG,MAAM,CAAC;IAE1B,KAAY,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC;CAC9B;AAED;;;;;;;;GAQG;AACH,KAAK,eAAe,CAAC,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,MAAM,IACrD,IAAI,GACJ,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;AAEpF;;;;;;;;GAQG;AACH,KAAK,sBAAsB,CAAC,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,MAAM,IAC9D,GAAG,eAAe,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,GAAG,EAAE,CAAC;AAEpD;;;;;;;;;;GAUG;AACH,MAAM,MAAM,cAAc,CAAC,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,MAAM,IAC3D,eAAe,CAAC,UAAU,CAAC,GAC3B,sBAAsB,CAAC,UAAU,CAAC,GAElC,GAAG,MAAM,IAAI,MAAM,EAAE,CAAC;AAE1B;;;;;;;;;;GAUG;AACH,MAAM,MAAM,aAAa,CAAC,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,MAAM,IAC1D,cAAc,CAAC,UAAU,CAAC,EAAE,GAC5B,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;AAEjC;;;;;;;;;;GAUG;AACH,MAAM,MAAM,cAAc,CAAC,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,EAAE,CACpF,MAAM,CAAC,2BAA2B,EAClC;KACG,IAAI,IAAI,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,SAAS,eAAe,CAAC,UAAU,CAAC,GAE/E,SAAS,CAAC,GAAG,GACb,IAAI,SAAS,SAAS,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAEpD,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,GACrD,KAAK;CACV,EACD;IACE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;CAC3D,CACF,CAAC;AAEF;;;;;;GAMG;AACH,KAAK,kBAAkB,CAAC,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,MAAM,IACxD,eAAe,CAAC,UAAU,CAAC,GAC3B,SAAS,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;AAE5C;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,GAAG,CAAC,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,MAAM,IAChD,cAAc,CAAC,UAAU,CAAC,GAC1B,aAAa,CAAC,UAAU,CAAC,GACzB,cAAc,CAAC,UAAU,CAAC,CAAC"}
+{"version":3,"file":"sort.d.ts","sourceRoot":"","sources":["../../../../src/modules/entity-service/params/sort.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAE/C,OAAO,KAAK,KAAK,GAAG,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAG3D,yBAAiB,SAAS,CAAC;IACzB,KAAY,GAAG,GAAG,KAAK,CAAC;IACxB,KAAY,IAAI,GAAG,MAAM,CAAC;IAE1B,KAAY,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC;CAC9B;AAED;;;;;;;;GAQG;AACH,KAAK,eAAe,CAAC,UAAU,SAAS,GAAG,CAAC,MAAM,IAC9C,IAAI,GACJ,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,4BAA4B,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;AAElF;;;;;;;;GAQG;AACH,KAAK,sBAAsB,CAAC,UAAU,SAAS,GAAG,CAAC,MAAM,IACvD,GAAG,eAAe,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,GAAG,EAAE,CAAC;AAEpD;;;;;;;;;;GAUG;AACH,MAAM,MAAM,cAAc,CAAC,UAAU,SAAS,GAAG,CAAC,MAAM,IACpD,eAAe,CAAC,UAAU,CAAC,GAC3B,sBAAsB,CAAC,UAAU,CAAC,GAElC,GAAG,MAAM,IAAI,MAAM,EAAE,CAAC;AAE1B;;;;;;;;;;GAUG;AACH,MAAM,MAAM,aAAa,CAAC,UAAU,SAAS,GAAG,CAAC,MAAM,IACnD,cAAc,CAAC,UAAU,CAAC,EAAE,GAC5B,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;AAEjC;;;;;;;;;;GAUG;AACH,MAAM,MAAM,cAAc,CAAC,UAAU,SAAS,GAAG,CAAC,MAAM,IAAI,EAAE,CAC5D,SAAS,CAAC,2BAA2B,EACrC;KACG,IAAI,IAAI,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,SAAS,eAAe,CAAC,UAAU,CAAC,GAE/E,SAAS,CAAC,GAAG,GACb,IAAI,SAAS,MAAM,CAAC,wBAAwB,CAAC,UAAU,CAAC,GAExD,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,GACjF,KAAK;CACV,EACD;IACE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;CAC3D,CACF,CAAC;AAEF;;;;;;GAMG;AACH,KAAK,kBAAkB,CAAC,UAAU,SAAS,GAAG,CAAC,MAAM,IACjD,eAAe,CAAC,UAAU,CAAC,GAC3B,MAAM,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;AAEhD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,GAAG,CAAC,UAAU,SAAS,GAAG,CAAC,MAAM,IACzC,cAAc,CAAC,UAAU,CAAC,GAC1B,aAAa,CAAC,UAAU,CAAC,GACzB,cAAc,CAAC,UAAU,CAAC,CAAC"}

package/dist/modules/entity-service/plugin.d.ts

@@ -1,8 +1,11 @@
-import type { Common, Plugin, Utils, Shared } from '../../types';
-export type GetPluginParams<TSchemaUID extends Common.UID.Schema> = Utils.Guard.OfTypes<[
+import type * as Plugin from '../../plugin';
+import type * as UID from '../../uid';
+import type * as Public from '../../public';
+import type { Guard, Object, If } from '../../utils';
+export type GetPluginParams<TSchemaUID extends UID.Schema> = Guard.OfTypes<[
     never,
     undefined
-], Utils.Object.Values<{
-    [TPluginName in keyof Shared.EntityServicePluginParams]: Shared.EntityServicePluginParams[TPluginName] extends infer TParam ? Utils.Expression.If<Plugin.IsEnabled<TPluginName, TSchemaUID>, TParam> : never;
-}>, unknown>;
+], Object.Values<{
+    [TPluginName in keyof Public.EntityServicePluginParams]: Public.EntityServicePluginParams[TPluginName] extends infer TParam ? If<Plugin.IsEnabled<TPluginName, TSchemaUID>, TParam> : never;
+}>>;
 //# sourceMappingURL=plugin.d.ts.map

package/dist/modules/entity-service/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/modules/entity-service/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAEjE,MAAM,MAAM,eAAe,CAAC,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CACrF;IAAC,KAAK;IAAE,SAAS;CAAC,EAClB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;KACjB,WAAW,IAAI,MAAM,MAAM,CAAC,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,CAAC,WAAW,CAAC,SAAS,MAAM,MAAM,GACvH,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,GACtE,KAAK;CACV,CAAC,EACF,OAAO,CACR,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/modules/entity-service/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,KAAK,GAAG,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,KAAK,MAAM,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAErD,MAAM,MAAM,eAAe,CAAC,UAAU,SAAS,GAAG,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,CACxE;IAAC,KAAK;IAAE,SAAS;CAAC,EAClB,MAAM,CAAC,MAAM,CAAC;KACX,WAAW,IAAI,MAAM,MAAM,CAAC,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,CAAC,WAAW,CAAC,SAAS,MAAM,MAAM,GACvH,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,GACrD,KAAK;CACV,CAAC,CACH,CAAC"}

package/dist/modules/entity-service/result.d.ts

@@ -1,5 +1,8 @@
-import type { Attribute, Common, Utils } from '../../types';
 import type { Params } from './index';
+import type * as Schema from '../../schema';
+import type * as Data from '../../data';
+import type { Array, Constants, Guard, String, Cast, If, MatchFirst, StrictEqual, Or, Extends, IsNever } from '../../utils';
+import type * as UID from '../../uid';
 type Pagination = {
     page: number;
     pageSize: number;
@@ -11,10 +14,10 @@ type AnyEntity = {
 } & {
     [key: string]: any;
 };
-export type Result<TSchemaUID extends Common.UID.Schema, TParams extends Params.Pick<TSchemaUID, 'fields' | 'populate'> = never> = Utils.Expression.If<Common.AreSchemaRegistriesExtended, GetValues<TSchemaUID, Utils.Guard.Never<ExtractFields<TSchemaUID, TParams['fields']>, Attribute.GetNonPopulatableKeys<TSchemaUID>>, ExtractPopulate<TSchemaUID, TParams['populate']>>, AnyEntity>;
-export type Entity<TSchemaUID extends Common.UID.Schema, TParams extends Params.Pick<TSchemaUID, 'fields' | 'populate'> = never> = Utils.Expression.If<Common.AreSchemaRegistriesExtended, GetValues<TSchemaUID, Utils.Guard.Never<ExtractFields<TSchemaUID, TParams['fields']>, Attribute.GetNonPopulatableKeys<TSchemaUID>>, Utils.Guard.Never<ExtractPopulate<TSchemaUID, TParams['populate']>, Attribute.GetPopulatableKeys<TSchemaUID>>>, AnyEntity>;
-export type PartialEntity<TSchemaUID extends Common.UID.Schema, TParams extends Params.Pick<TSchemaUID, 'fields' | 'populate'> = never> = Partial<Entity<TSchemaUID, TParams>>;
-export type PaginatedResult<TSchemaUID extends Common.UID.Schema, TParams extends Params.Pick<TSchemaUID, 'fields' | 'populate'> = never> = {
+export type Result<TSchemaUID extends UID.Schema, TParams extends Params.Pick<TSchemaUID, 'fields' | 'populate'> = never> = If<Constants.AreSchemaRegistriesExtended, GetValues<TSchemaUID, Guard.Never<ExtractFields<TSchemaUID, TParams['fields']>, Schema.NonPopulatableAttributeNames<TSchemaUID>>, ExtractPopulate<TSchemaUID, TParams['populate']>>, AnyEntity>;
+export type Entity<TSchemaUID extends UID.Schema, TParams extends Params.Pick<TSchemaUID, 'fields' | 'populate'> = never> = If<Constants.AreSchemaRegistriesExtended, GetValues<TSchemaUID, Guard.Never<ExtractFields<TSchemaUID, TParams['fields']>, Schema.NonPopulatableAttributeNames<TSchemaUID>>, Guard.Never<ExtractPopulate<TSchemaUID, TParams['populate']>, Schema.PopulatableAttributeNames<TSchemaUID>>>, AnyEntity>;
+export type PartialEntity<TSchemaUID extends UID.Schema, TParams extends Params.Pick<TSchemaUID, 'fields' | 'populate'> = never> = Partial<Entity<TSchemaUID, TParams>>;
+export type PaginatedResult<TSchemaUID extends UID.Schema, TParams extends Params.Pick<TSchemaUID, 'fields' | 'populate'> = never> = {
     results: Entity<TSchemaUID, TParams>[];
     pagination: Pagination;
 };
@@ -23,65 +26,51 @@ export type PaginatedResult<TSchemaUID extends Common.UID.Schema, TParams extend
  *
  * TODO: Make it recursive for populatable fields
  */
-export type GetValues<TSchemaUID extends Common.UID.Schema, TFields extends Attribute.GetKeys<TSchemaUID> = Attribute.GetNonPopulatableKeys<TSchemaUID>, TPopulate extends Attribute.GetKeys<TSchemaUID> = Attribute.GetPopulatableKeys<TSchemaUID>> = Utils.Expression.If<Common.AreSchemaRegistriesExtended, Utils.Guard.Never<TFields | TPopulate, Attribute.GetKeys<TSchemaUID>> extends infer TKeys extends Attribute.GetKeys<TSchemaUID> ? Attribute.GetValues<TSchemaUID, TKeys> : never, AnyEntity>;
-type ExtractFields<TSchemaUID extends Common.UID.Schema, TFields extends Params.Fields.Any<TSchemaUID> | undefined> = Utils.Expression.MatchFirst<[
+export type GetValues<TSchemaUID extends UID.Schema, TFields extends Schema.AttributeNames<TSchemaUID> = Schema.NonPopulatableAttributeNames<TSchemaUID>, TPopulate extends Schema.AttributeNames<TSchemaUID> = Schema.PopulatableAttributeNames<TSchemaUID>> = If<Constants.AreSchemaRegistriesExtended, Guard.Never<TFields | TPopulate, Schema.AttributeNames<TSchemaUID>> extends infer TKeys extends Schema.AttributeNames<TSchemaUID> ? Data.Entity<TSchemaUID, TKeys> : never, AnyEntity>;
+type ExtractFields<TSchemaUID extends UID.Schema, TFields extends Params.Fields.Any<TSchemaUID> | undefined> = Extract<MatchFirst<[
     [
-        Utils.Expression.Or<Utils.Expression.StrictEqual<TFields, Params.Fields.Any<TSchemaUID>>, Utils.Expression.Or<Utils.Expression.IsNever<TFields>, Utils.Expression.StrictEqual<TFields, undefined>>>,
+        Or<StrictEqual<TFields, Params.Fields.Any<TSchemaUID>>, Or<IsNever<TFields>, StrictEqual<TFields, undefined>>>,
         never
     ],
     [
-        Utils.Expression.Extends<TFields, Params.Fields.StringNotation<TSchemaUID>>,
-        ParseStringFields<TSchemaUID, Utils.Cast<TFields, Params.Fields.StringNotation<TSchemaUID>>>
-    ],
-    [
-        Utils.Expression.Extends<TFields, Params.Fields.ArrayNotation<TSchemaUID>>,
-        ParseStringFields<TSchemaUID, Utils.Cast<Utils.Array.Values<Utils.Cast<TFields, Params.Fields.ArrayNotation<TSchemaUID>>>, Params.Fields.StringNotation<TSchemaUID>>>
-    ]
-]>;
-type ParseStringFields<TSchemaUID extends Common.UID.Schema, TFields extends Params.Fields.StringNotation<TSchemaUID>> = Utils.Expression.MatchFirst<[
-    [
-        Utils.Expression.StrictEqual<TFields, Params.Fields.WildcardNotation>,
-        Attribute.GetNonPopulatableKeys<TSchemaUID>
-    ],
-    [
-        Utils.Expression.Extends<TFields, Params.Fields.SingleAttribute<TSchemaUID>>,
-        TFields
-    ],
-    [
-        Utils.Expression.Extends<TFields, `${string},${string}`>,
-        Utils.Array.Values<Utils.String.Split<Utils.Cast<TFields, string>, ','>>
+        Extends<TFields, Params.Fields.StringNotation<TSchemaUID>>,
+        ParseStringFields<TSchemaUID, Extract<TFields, Params.Fields.StringNotation<TSchemaUID>>>
     ]
-]>;
-type ExtractPopulate<TSchemaUID extends Common.UID.Schema, TPopulate extends Params.Populate.Any<TSchemaUID> | undefined> = Utils.Expression.MatchFirst<[
+], [
+    Extends<TFields, Params.Fields.ArrayNotation<TSchemaUID>>,
+    ParseStringFields<TSchemaUID, Extract<Array.Values<Cast<TFields, Params.Fields.ArrayNotation<TSchemaUID>>>, Params.Fields.StringNotation<TSchemaUID>>>
+]>, Schema.NonPopulatableAttributeNames<TSchemaUID>>;
+type ParseStringFields<TSchemaUID extends UID.Schema, TFields extends Params.Fields.StringNotation<TSchemaUID>> = TFields;
+type ExtractPopulate<TSchemaUID extends UID.Schema, TPopulate extends Params.Populate.Any<TSchemaUID> | undefined> = Extract<MatchFirst<[
     [
-        Utils.Expression.Or<Utils.Expression.StrictEqual<TPopulate, Params.Populate.Any<TSchemaUID>>, Utils.Expression.IsNever<TPopulate>>,
+        Or<StrictEqual<TPopulate, Params.Populate.Any<TSchemaUID>>, IsNever<TPopulate>>,
         never
     ],
     [
-        Utils.Expression.Extends<TPopulate, Params.Populate.StringNotation<TSchemaUID>>,
-        ParseStringPopulate<TSchemaUID, Utils.Cast<TPopulate, Params.Populate.StringNotation<TSchemaUID>>>
+        Extends<TPopulate, Params.Populate.StringNotation<TSchemaUID>>,
+        ParseStringPopulate<TSchemaUID, Cast<TPopulate, Params.Populate.StringNotation<TSchemaUID>>>
     ],
     [
-        Utils.Expression.Extends<TPopulate, Params.Populate.ArrayNotation<TSchemaUID>>,
-        ParseStringPopulate<TSchemaUID, Utils.Cast<Utils.Array.Values<Utils.Cast<TPopulate, Params.Populate.ArrayNotation<TSchemaUID>>>, Params.Populate.StringNotation<TSchemaUID>>>
+        Extends<TPopulate, Params.Populate.ArrayNotation<TSchemaUID>>,
+        ParseStringPopulate<TSchemaUID, Cast<Array.Values<Cast<TPopulate, Params.Populate.ArrayNotation<TSchemaUID>>>, Params.Populate.StringNotation<TSchemaUID>>>
     ],
     [
-        Utils.Expression.Extends<TPopulate, Params.Populate.ObjectNotation<TSchemaUID>>,
-        ParseStringPopulate<TSchemaUID, Utils.Cast<keyof TPopulate, Params.Populate.StringNotation<TSchemaUID>>>
+        Extends<TPopulate, Params.Populate.ObjectNotation<TSchemaUID>>,
+        ParseStringPopulate<TSchemaUID, Cast<keyof TPopulate, Params.Populate.StringNotation<TSchemaUID>>>
     ]
-]>;
-type ParsePopulateDotNotation<TSchemaUID extends Common.UID.Schema, TPopulate extends Params.Populate.StringNotation<TSchemaUID>> = Utils.Cast<Utils.String.Split<Utils.Cast<TPopulate, string>, '.'>[0], Attribute.GetPopulatableKeys<TSchemaUID>>;
-type ParseStringPopulate<TSchemaUID extends Common.UID.Schema, TPopulate extends Params.Populate.StringNotation<TSchemaUID>> = Utils.Expression.MatchFirst<[
+]>, Schema.NonPopulatableAttributeNames<TSchemaUID>>;
+type ParsePopulateDotNotation<TSchemaUID extends UID.Schema, TPopulate extends Params.Populate.StringNotation<TSchemaUID>> = Cast<String.Split<Cast<TPopulate, string>, '.'>[0], Schema.PopulatableAttributeNames<TSchemaUID>>;
+type ParseStringPopulate<TSchemaUID extends UID.Schema, TPopulate extends Params.Populate.StringNotation<TSchemaUID>> = MatchFirst<[
     [
-        Utils.Expression.StrictEqual<Params.Populate.WildcardNotation, TPopulate>,
-        Attribute.GetPopulatableKeys<TSchemaUID>
+        StrictEqual<Params.Populate.WildcardNotation, TPopulate>,
+        Schema.PopulatableAttributeNames<TSchemaUID>
     ],
     [
-        Utils.Expression.Extends<TPopulate, `${string},${string}`>,
-        ParsePopulateDotNotation<TSchemaUID, Utils.Cast<Utils.Array.Values<Utils.String.Split<Utils.Cast<TPopulate, string>, ','>>, Params.Populate.StringNotation<TSchemaUID>>>
+        Extends<TPopulate, `${string},${string}`>,
+        ParsePopulateDotNotation<TSchemaUID, Cast<Array.Values<String.Split<Cast<TPopulate, string>, ','>>, Params.Populate.StringNotation<TSchemaUID>>>
     ],
     [
-        Utils.Expression.Extends<TPopulate, `${string}.${string}`>,
+        Extends<TPopulate, `${string}.${string}`>,
         ParsePopulateDotNotation<TSchemaUID, TPopulate>
     ]
 ], TPopulate>;