@aeriajs/types 0.0.131 → 0.0.133

package/dist/config.d.ts

@@ -4,11 +4,18 @@ import type { RateLimitingParams } from './security.js';
 import type { CollectionItem } from './collection.js';
 import type { UserRole } from './token.js';
 export type RolesHierarchy = Record<UserRole, readonly UserRole[] | boolean>;
+export type CorsConfig = {
+    allowOrigin?: readonly string[];
+    allowMethods?: readonly string[];
+    allowHeaders?: readonly string[];
+    maxAge: string;
+};
 export type ServerOptions = {
     host?: string;
     port?: number;
     enableLogging?: boolean;
     noWarmup?: boolean;
+    cors?: CorsConfig | null;
 };
 export type ApiConfig = {
     name?: string;

package/dist/schema.d.ts

@@ -13,11 +13,17 @@ type CaseTimestamped<TSchema, TType> = TSchema extends {
     timestamps: false;
 } ? TType : TType & Timestamped;
 type TestType<T> = T & Record<string, unknown>;
-export type InferProperty<T> = T extends TestType<{
+type SchemaOptions = {
+    readonly keepTempIds?: boolean;
+    readonly useObjectIds?: boolean;
+};
+export type InferProperty<T, TSchemaOptions extends SchemaOptions = {}> = T extends TestType<{
     format: 'date' | 'date-time';
 }> ? Date : T extends TestType<{
     format: 'objectid';
-}> ? ObjectId : T extends TestType<{
+}> ? TSchemaOptions extends {
+    useObjectIds: false;
+} ? string : ObjectId : T extends TestType<{
     enum: ReadonlyArray<infer K>;
 }> ? K : T extends TestType<{
     type: 'string';
@@ -29,15 +35,15 @@ export type InferProperty<T> = T extends TestType<{
     properties: unknown;
 }> ? Schema<T & {
     timestamps: false;
-}> : T extends TestType<{
+}, TSchemaOptions> : T extends TestType<{
     additionalProperties: true;
 }> ? any : T extends TestType<{
     additionalProperties: infer K;
 }> ? {
-    [P: string]: InferProperty<K> | undefined;
+    [P: string]: InferProperty<K, TSchemaOptions> | undefined;
 } : T extends TestType<{
     items: infer K;
-}> ? InferProperty<K>[] : T extends TestType<{
+}> ? InferProperty<K, TSchemaOptions>[] : T extends TestType<{
     getter: (doc: unknown) => infer K;
 }> ? Awaited<K> : T extends TestType<{
     const: infer K;
@@ -47,9 +53,6 @@ export type InferProperty<T> = T extends TestType<{
 type ExtractRequiredPropNames<T> = T extends readonly (infer PropName)[] ? PropName : Record<never, never> extends T ? null : keyof {
     [K in keyof T as T[K] extends true ? K : never]: never;
 };
-type SchemaOptions = {
-    readonly keepTempIds?: boolean;
-};
 export type InferSchema<TSchema, TSchemaOptions extends SchemaOptions = {}> = MergeReferences<TSchema, TSchemaOptions> extends infer MappedTypes ? TSchema extends {
     required: readonly [];
 } ? Partial<MappedTypes> : TSchema extends {
@@ -57,22 +60,24 @@ export type InferSchema<TSchema, TSchemaOptions extends SchemaOptions = {}> = Me
 } ? ExtractRequiredPropNames<InferredRequired> extends infer RequiredPropName ? Pick<MappedTypes, Extract<keyof MappedTypes, RequiredPropName>> extends infer RequiredProps ? RequiredProps & Partial<Exclude<MappedTypes, keyof RequiredProps>> : never : Partial<MappedTypes> : MappedTypes : never;
 export type Schema<TSchema, TSchemaOptions extends SchemaOptions = {}> = CaseTimestamped<TSchema, CaseOwned<TSchema, InferSchema<TSchema, TSchemaOptions>>>;
 export type SchemaWithId<TSchema, TSchemaOptions extends SchemaOptions = {}> = Schema<TSchema, TSchemaOptions> & {
-    _id: ObjectId;
+    _id: TSchemaOptions extends {
+        useObjectIds: false;
+    } ? string : ObjectId;
 };
-export type InferProperties<TSchema> = (TSchema extends readonly unknown[] ? TSchema extends readonly (infer SchemaOption)[] ? SchemaOption extends unknown ? SchemaOption : never : never : TSchema) extends infer InferredSchema ? InferredSchema extends {
+export type InferProperties<TSchema, TSchemaOptions extends SchemaOptions = {}> = (TSchema extends readonly unknown[] ? TSchema extends readonly (infer SchemaOption)[] ? SchemaOption extends unknown ? SchemaOption : never : never : TSchema) extends infer InferredSchema ? InferredSchema extends {
     $ref: infer K;
 } | {
     items: {
         $ref: infer K;
     };
-} ? K extends keyof Collections ? 'items' extends keyof InferredSchema ? Collections[K]['item'][] : Collections[K]['item'] : never : InferProperty<InferredSchema> : never;
+} ? K extends keyof Collections ? 'items' extends keyof InferredSchema ? Collections[K]['item'][] : Collections[K]['item'] : never : InferProperty<InferredSchema, TSchemaOptions> : never;
 export type PackReferences<T> = {
     [P in keyof T]: PackReferencesAux<T[P]>;
 };
-export type FilterReadonlyProperties<TProperties> = {
+export type FilterReadonlyProperties<TProperties, TSchemaOptions extends SchemaOptions = {}> = {
     [P in keyof TProperties as TProperties[P] extends {
         readOnly: true;
-    } ? P : never]: InferProperty<TProperties[P]>;
+    } ? P : never]: InferProperty<TProperties[P], TSchemaOptions>;
 };
 type MapReferences<TSchema, TSchemaOptions extends SchemaOptions> = TSchema extends {
     properties: infer Properties;
@@ -102,10 +107,10 @@ type MapReferences<TSchema, TSchemaOptions extends SchemaOptions> = TSchema exte
 type PackReferencesAux<T> = T extends (...args: unknown[]) => unknown ? T : T extends ObjectId ? T : T extends {
     _id: infer Id;
 } ? Id : T extends Record<string, unknown> ? PackReferences<T> : T extends unknown[] | readonly unknown[] ? PackReferencesAux<T[number]>[] : T;
-type CombineProperties<TSchema> = TSchema extends {
+type CombineProperties<TSchema, TSchemaOptions extends SchemaOptions> = TSchema extends {
     properties: infer Properties;
-} ? FilterReadonlyProperties<Properties> extends infer ReadonlyProperties ? Readonly<ReadonlyProperties> & {
-    [P in Exclude<keyof Properties, keyof ReadonlyProperties>]: InferProperty<Properties[P]>;
+} ? FilterReadonlyProperties<Properties, TSchemaOptions> extends infer ReadonlyProperties ? Readonly<ReadonlyProperties> & {
+    [P in Exclude<keyof Properties, keyof ReadonlyProperties>]: InferProperty<Properties[P], TSchemaOptions>;
 } : never : never;
-type MergeReferences<TSchema, TSchemaOptions extends SchemaOptions> = CombineProperties<TSchema> extends infer CombinedProperties ? MapReferences<TSchema, TSchemaOptions> extends infer MappedReferences ? MappedReferences & Omit<CombinedProperties, keyof MappedReferences> : never : never;
+type MergeReferences<TSchema, TSchemaOptions extends SchemaOptions> = CombineProperties<TSchema, TSchemaOptions> extends infer CombinedProperties ? MapReferences<TSchema, TSchemaOptions> extends infer MappedReferences ? MappedReferences & Omit<CombinedProperties, keyof MappedReferences> : never : never;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/types",
-  "version": "0.0.131",
+  "version": "0.0.133",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",