@aeriajs/core 0.0.115 → 0.0.117

package/dist/assets.d.ts

@@ -1,6 +1,6 @@
-import type { Context, Collection, Token } from '@aeriajs/types';
+import type { AssetType, Context, Collection, Token } from '@aeriajs/types';
 import { ACError } from '@aeriajs/types';
-export declare const internalGetCollectionAsset: <TCollectionName extends string, TAssetName extends "item" | "description" | "security" | "functions" | "contracts" | "exposedFunctions">(collectionName: TCollectionName, assetName: TAssetName) => Promise<{
+export declare const internalGetCollectionAsset: <TCollectionName extends string, TAssetName extends keyof Collections[TCollectionName] & AssetType>(collectionName: TCollectionName, assetName: TAssetName) => Promise<{
     readonly _tag: "Error";
     readonly error: ACError.ResourceNotFound;
     readonly result: undefined;
@@ -9,7 +9,7 @@ export declare const internalGetCollectionAsset: <TCollectionName extends string
     readonly error: undefined;
     readonly result: NonNullable<Collection[TAssetName]>;
 }>;
-export declare const getCollectionAsset: <TCollectionName extends string, TAssetName extends "item" | "description" | "security" | "functions" | "contracts" | "exposedFunctions">(collectionName: TCollectionName, assetName: TAssetName) => Promise<{
+export declare const getCollectionAsset: <TCollectionName extends string, TAssetName extends keyof Collections[TCollectionName] & AssetType>(collectionName: TCollectionName, assetName: TAssetName) => Promise<{
     readonly _tag: "Error";
     readonly error: ACError.ResourceNotFound;
     readonly result: undefined;

package/dist/collection/define.d.ts

@@ -2,7 +2,7 @@ import type { SchemaWithId, Collection, StrictContext, Contract, ContractToFunct
 export type ExtendCollection<TLeftCollection extends Collection, TRightCollection> = Omit<TLeftCollection & TRightCollection, 'item'> & {
     item: SchemaWithId<(TLeftCollection & TRightCollection)['description']>;
 };
-export declare const defineCollection: <TCollection extends Omit<Collection<TCollection extends Collection ? TCollection : never>, "item" | "description" | "security" | "functions" | "exposedFunctions">, const TDescription extends Description<TDescription>, const TContracts extends { [P in keyof TFunctions]?: Contract | undefined; }, const TExposedFunctions extends Partial<Record<keyof TFunctions, AccessCondition>>, const TFunctions extends Record<string, (payload: any, context: StrictContext<any>) => any> & { [P_1 in keyof TContracts | keyof TExposedFunctions]: ContractToFunction<P_1 extends keyof TContracts ? NonNullable<TContracts[P_1]> : any, StrictContext<P_1 extends keyof TExposedFunctions ? RoleFromAccessCondition<TExposedFunctions[P_1]> : never, TDescription>>; }>(collection: TCollection & {
+export declare const defineCollection: <TCollection extends Collection<TCollection extends Collection ? TCollection : never> extends infer Coll ? Omit<Coll, "item" | "description" | "functions" | "exposedFunctions" | "security"> : never, const TDescription extends Description<TDescription>, const TContracts extends { [P in keyof TFunctions]?: Contract; }, const TExposedFunctions extends Partial<Record<keyof TFunctions, AccessCondition>>, const TFunctions extends Record<string, (payload: any, context: StrictContext<any>) => any> & { [P in keyof TContracts | keyof TExposedFunctions]: ContractToFunction<P extends keyof TContracts ? NonNullable<TContracts[P]> : any, StrictContext<P extends keyof TExposedFunctions ? RoleFromAccessCondition<TExposedFunctions[P]> : never, TDescription>>; }>(collection: TCollection & {
     description: TDescription;
     functions?: TFunctions;
     contracts?: TContracts;
@@ -16,11 +16,4 @@ export declare const defineCollection: <TCollection extends Omit<Collection<TCol
     functions: TFunctions;
     contracts: TContracts;
 };
-export declare const extendCollection: <const TLeftCollection extends Collection, const TRightCollection extends {
-    description?: Partial<Description> | undefined;
-    item?: Partial<any> | undefined;
-    security?: Partial<CollectionSecurityPolicy<any> | undefined>;
-    functions?: Partial<Record<string, (payload: any, context: import("@aeriajs/types").Context<any>, ...args: any[]) => any> | undefined>;
-    contracts?: Partial<Record<string, Contract> | undefined>;
-    exposedFunctions?: Partial<Record<string, AccessCondition> | undefined>;
-}>(left: TLeftCollection, right: TRightCollection) => ExtendCollection<TLeftCollection, TRightCollection>;
+export declare const extendCollection: <const TLeftCollection extends Collection, const TRightCollection extends { [P in keyof Collection]?: Partial<Collection[P]>; }>(left: TLeftCollection, right: TRightCollection) => ExtendCollection<TLeftCollection, TRightCollection>;

package/dist/collection/preload.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { Description, Property } from '@aeriajs/types';
 import * as presets from '../presets/index.js';
 export type PreloadOptions = {
@@ -6,7 +5,7 @@ export type PreloadOptions = {
     memoize?: boolean;
     timestamps?: boolean;
 };
-export declare const applyPreset: (entry: Partial<Description> | Description['properties'], presetName: keyof typeof presets, parentName?: string) => (Record<string, Property> | Partial<Description>) & ({
+export declare const applyPreset: (entry: Partial<Description> | Description["properties"], presetName: keyof typeof presets, parentName?: string) => (Record<string, Property> | Partial<Description>) & ({
     readonly actions: {
         readonly removeAll: {
             readonly label: "action.removeAll";

package/dist/collection/reference.d.ts

@@ -19,6 +19,6 @@ export type BuildLookupOptions = {
     memoize?: string;
     project?: string[];
 };
-export declare const getReferences: (properties: FixedObjectProperty['properties'], options?: GetReferenceOptions) => Promise<{}>;
+export declare const getReferences: (properties: FixedObjectProperty["properties"], options?: GetReferenceOptions) => Promise<{}>;
 export declare const buildLookupPipeline: (referenceMap: ReferenceMap | {}, options: BuildLookupOptions) => Promise<any[]>;
-export declare const getLookupPipeline: (description: Description, _options?: Omit<BuildLookupOptions, 'properties'>) => Promise<any[]>;
+export declare const getLookupPipeline: (description: Description, _options?: Omit<BuildLookupOptions, "properties">) => Promise<any[]>;

package/dist/collection/traverseDocument.js

@@ -269,41 +269,48 @@ const recurse = async (target, ctx) => {
             ]);
             continue;
         }
-        if (!property && value && (value.constructor === Object || value.constructor === Array)) {
-            // if first propName is preceded by '$' we assume
-            // it contains MongoDB query operators
-            if (Object.keys(value)[0]?.startsWith('$')) {
-                if (!ctx.options.allowOperators) {
-                    return types_1.Result.error(types_1.ACError.InsecureOperator);
+        if (!property) {
+            if (value && (value.constructor === Object || value.constructor === Array)) {
+                // if first propName is preceded by '$' we assume
+                // it contains MongoDB query operators
+                if (Object.keys(value)[0]?.startsWith('$')) {
+                    if (!ctx.options.allowOperators) {
+                        return types_1.Result.error(types_1.ACError.InsecureOperator);
+                    }
+                    entries.push([
+                        propName,
+                        value,
+                    ]);
+                    continue;
                 }
-                entries.push([
-                    propName,
-                    value,
-                ]);
-                continue;
-            }
-            if (Array.isArray(value)) {
-                const operations = [];
-                for (const operation of value) {
-                    const { error, result } = await recurse(operation, ctx);
-                    if (error) {
-                        return types_1.Result.error(error);
+                if (Array.isArray(value)) {
+                    const operations = [];
+                    for (const operation of value) {
+                        const { error, result } = await recurse(operation, ctx);
+                        if (error) {
+                            return types_1.Result.error(error);
+                        }
+                        operations.push(result);
                     }
-                    operations.push(result);
+                    entries.push([
+                        propName,
+                        operations,
+                    ]);
+                    continue;
+                }
+                const { error, result: operator } = await recurse(value, ctx);
+                if (error) {
+                    return types_1.Result.error(error);
                 }
                 entries.push([
                     propName,
-                    operations,
+                    operator,
                 ]);
                 continue;
             }
-            const { error, result: operator } = await recurse(value, ctx);
-            if (error) {
-                return types_1.Result.error(error);
-            }
             entries.push([
                 propName,
-                operator,
+                value,
             ]);
         }
         if (property) {

package/dist/collection/traverseDocument.mjs

@@ -233,39 +233,46 @@ const recurse = async (target, ctx) => {
       ]);
       continue;
     }
-    if (!property && value && (value.constructor === Object || value.constructor === Array)) {
-      if (Object.keys(value)[0]?.startsWith("$")) {
-        if (!ctx.options.allowOperators) {
-          return Result.error(ACError.InsecureOperator);
+    if (!property) {
+      if (value && (value.constructor === Object || value.constructor === Array)) {
+        if (Object.keys(value)[0]?.startsWith("$")) {
+          if (!ctx.options.allowOperators) {
+            return Result.error(ACError.InsecureOperator);
+          }
+          entries.push([
+            propName,
+            value
+          ]);
+          continue;
         }
-        entries.push([
-          propName,
-          value
-        ]);
-        continue;
-      }
-      if (Array.isArray(value)) {
-        const operations = [];
-        for (const operation of value) {
-          const { error: error2, result } = await recurse(operation, ctx);
-          if (error2) {
-            return Result.error(error2);
+        if (Array.isArray(value)) {
+          const operations = [];
+          for (const operation of value) {
+            const { error: error2, result } = await recurse(operation, ctx);
+            if (error2) {
+              return Result.error(error2);
+            }
+            operations.push(result);
           }
-          operations.push(result);
+          entries.push([
+            propName,
+            operations
+          ]);
+          continue;
+        }
+        const { error, result: operator } = await recurse(value, ctx);
+        if (error) {
+          return Result.error(error);
         }
         entries.push([
           propName,
-          operations
+          operator
         ]);
         continue;
       }
-      const { error, result: operator } = await recurse(value, ctx);
-      if (error) {
-        return Result.error(error);
-      }
       entries.push([
         propName,
-        operator
+        value
       ]);
     }
     if (property) {

package/dist/database.d.ts

@@ -3,7 +3,7 @@ import { MongoClient } from 'mongodb';
 export { ObjectId, } from 'mongodb';
 export declare const getDatabase: () => Promise<{
     client: MongoClient;
-    db: ReturnType<MongoClient['db']> | undefined;
+    db: ReturnType<MongoClient["db"]> | undefined;
 }>;
 export declare const getDatabaseSync: () => import("mongodb").Db;
 export declare const prepareCollectionName: (collectionName: string) => string;

package/dist/functions/builtin/count.d.ts

@@ -1,5 +1,5 @@
 import type { Context, SchemaWithId, CountPayload } from '@aeriajs/types';
-export declare const count: <TContext extends Context>(payload: CountPayload<SchemaWithId<Context['description']>>, context: TContext extends Context<any> ? TContext : never) => Promise<{
+export declare const count: <TContext extends Context>(payload: CountPayload<SchemaWithId<TContext["description"]>>, context: TContext extends Context<any> ? TContext : never) => Promise<{
     readonly _tag: "Result";
     readonly error: undefined;
     readonly result: any;

package/dist/functions/builtin/get.d.ts

@@ -2,4 +2,4 @@ import type { Context, SchemaWithId, GetPayload, GetReturnType } from '@aeriajs/
 export type GetOptions = {
     bypassSecurity?: boolean;
 };
-export declare const get: <TContext extends Context>(payload: GetPayload<SchemaWithId<TContext['description']>>, context: TContext extends Context<any> ? TContext : never, options?: GetOptions) => Promise<GetReturnType<TContext['description']>>;
+export declare const get: <TContext extends Context>(payload: GetPayload<SchemaWithId<TContext["description"]>>, context: TContext extends Context<any> ? TContext : never, options?: GetOptions) => Promise<GetReturnType<TContext["description"]>>;

package/dist/functions/builtin/getAll.d.ts

@@ -2,7 +2,7 @@ import type { Context, SchemaWithId, GetAllPayload } from '@aeriajs/types';
 export type GetAllOptions = {
     bypassSecurity?: boolean;
 };
-export declare const getAll: <TContext extends Context>(_payload: GetAllPayload<SchemaWithId<Context['description']>> | undefined, context: TContext, options?: GetAllOptions) => Promise<{
+export declare const getAll: <TContext extends Context>(_payload: GetAllPayload<SchemaWithId<TContext["description"]>> | undefined, context: TContext, options?: GetAllOptions) => Promise<{
     readonly _tag: "Result";
     readonly error: undefined;
     readonly result: SchemaWithId<TContext["description"]>[];

package/dist/functions/builtin/insert.d.ts

@@ -33,4 +33,4 @@ export declare const insertErrorSchema: () => {
         };
     };
 };
-export declare const insert: <TContext extends Context>(payload: InsertPayload<SchemaWithId<TContext['description']>>, context: TContext, options?: InsertOptions) => Promise<InsertReturnType<SchemaWithId<TContext['description']>>>;
+export declare const insert: <TContext extends Context>(payload: InsertPayload<SchemaWithId<TContext["description"]>>, context: TContext, options?: InsertOptions) => Promise<InsertReturnType<SchemaWithId<TContext["description"]>>>;

package/dist/functions/builtin/remove.d.ts

@@ -1,6 +1,6 @@
 import type { Context, SchemaWithId, RemovePayload } from '@aeriajs/types';
 import { Result, HTTPStatus, ACError } from '@aeriajs/types';
-export declare const remove: <TContext extends Context>(payload: RemovePayload<SchemaWithId<TContext['description']>>, context: TContext) => Promise<Result.Error<{
+export declare const remove: <TContext extends Context>(payload: RemovePayload<SchemaWithId<TContext["description"]>>, context: TContext) => Promise<Result.Error<{
     readonly code: ACError.ResourceNotFound;
 } & {
     httpStatus: HTTPStatus.NotFound;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/core",
-  "version": "0.0.115",
+  "version": "0.0.117",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -41,11 +41,11 @@
     "mongodb-memory-server": "^9.2.0"
   },
   "peerDependencies": {
-    "@aeriajs/builtins": "^0.0.115",
+    "@aeriajs/builtins": "^0.0.117",
     "@aeriajs/common": "^0.0.74",
     "@aeriajs/entrypoint": "^0.0.76",
     "@aeriajs/http": "^0.0.85",
-    "@aeriajs/security": "^0.0.115",
+    "@aeriajs/security": "^0.0.117",
     "@aeriajs/types": "^0.0.64",
     "@aeriajs/validation": "^0.0.77"
   },