@arcote.tech/arc 0.7.7 → 0.7.9

package/dist/context-element/aggregate/aggregate-data.d.ts

@@ -37,6 +37,8 @@ export interface AggregateMutateMethodEntry {
     readonly cronExpression?: string;
     readonly queryElements?: ArcContextElement<any>[];
     readonly mutationElements?: ArcContextElement<any>[];
+    readonly protections?: ViewProtection[];
+    readonly isPrivate?: boolean;
 }
 /**
  * Cron method entry extracted at build time.
@@ -51,7 +53,10 @@ export interface AggregateCronMethodEntry {
  */
 export interface AggregateQueryMethodEntry {
     readonly name: string;
+    readonly params?: ArcObjectAny | null;
     readonly handler: Function | false | null;
+    readonly protections?: ViewProtection[];
+    readonly isPrivate?: boolean;
 }
 /**
  * Resolve mutateMethod return type from entry fields.

package/dist/context-element/aggregate/aggregate-element.d.ts

@@ -150,7 +150,7 @@ export declare class ArcAggregateElement<Name extends string = string, Id extend
             params: ReturnFn["data"]["params"];
             handler: ReturnFn["data"]["handler"];
             handlerReturn: ReturnFn["data"]["handler"] extends (...args: any[]) => Promise<infer HR> ? HR : void;
-            result: ReturnFn["data"]["result"] extends ArcObjectAny ? $type<ReturnFn["data"]["result"]> : never;
+            result: ReturnFn["data"]["results"] extends [] ? never : $type<ReturnFn["data"]["results"][number]>;
         }
     ], QueryMethods>;
     cron(expression: string): ArcAggregateElement<Name, Id, Schema, Events, MutateMethods, QueryMethods>;

package/dist/context-element/command/command.d.ts

@@ -47,10 +47,10 @@ export declare class ArcCommand<const Data extends ArcCommandData> extends ArcCo
     withParams<NewParams extends ArcRawShape>(schema: NewParams | ArcObject<NewParams>): ArcCommand<Merge<Data, {
         params: ArcObject<NewParams>;
     }>>;
-    withResult<NewResults extends ArcRawShape[]>(...schemas: NewResults): ArcCommand<Merge<Data, {
-        results: { [K in keyof NewResults]: ArcObject<NewResults[K]>; };
+    withResult<NewResults extends (ArcRawShape | ArcObjectAny)[]>(...schemas: NewResults): ArcCommand<Merge<Data, {
+        results: { [K in keyof NewResults]: NewResults[K] extends ArcObjectAny ? NewResults[K] : NewResults[K] extends ArcRawShape ? ArcObject<NewResults[K]> : never; };
     }>>;
-    handle<Handler extends ArcCommandHandler<ArcCommandContextFromData<Data>, Data["params"] extends ArcObjectAny ? $type<Data["params"]> : null, $type<Data["results"][number]>> | false>(handler: Handler): ArcCommand<Merge<Data, {
+    handle<Handler extends ArcCommandHandler<ArcCommandContextFromData<Data>, Data["params"] extends ArcObjectAny ? $type<Data["params"]> : null, Data["results"] extends [] ? void : $type<Data["results"][number]>> | false>(handler: Handler): ArcCommand<Merge<Data, {
         handler: Handler;
     }>>;
     protectBy<T extends ArcTokenAny>(token: T, check: FnProtectionCheck<T>): ArcCommand<Merge<Data, {

package/dist/context-element/function/arc-function-data.d.ts

@@ -23,7 +23,7 @@ export type TypedTokenInstance<T extends ArcTokenAny> = T extends ArcToken<any,
  * - `Record` → access allowed + merged into WHERE clause (query context)
  *              + validated on writes (scope enforcement)
  */
-export type FnProtectionCheck<T extends ArcTokenAny> = (tokenInstance: TypedTokenInstance<T>) => boolean | Record<string, unknown> | Promise<boolean | Record<string, unknown>>;
+export type FnProtectionCheck<T extends ArcTokenAny> = (params: T extends import("../../token/token").ArcToken<any, infer P extends import("../../elements/object").ArcRawShape, any, any> ? import("../../utils/types/get-type").$type<import("../../elements/object").ArcObject<P>> : Record<string, any>) => boolean | Record<string, unknown> | Promise<boolean | Record<string, unknown>>;
 /**
  * Protection configuration for an ArcFunction.
  */
@@ -55,12 +55,18 @@ type ProtectionTokens<Protections extends FnProtection[]> = Protections[number][
  */
 export type ArcFunctionData = {
     params: ArcObjectAny | null;
-    result: ArcObjectAny | null;
+    results: ArcObjectAny[];
     queryElements: ArcContextElement<any>[];
     mutationElements: ArcContextElement<any>[];
     protections: FnProtection[];
     handler: Function | false | null;
     description?: string;
+    /**
+     * Private (server-internal) marker. When true, the wrapping aggregate
+     * MUST NOT expose this function over commandWire — only server-side
+     * callers (listeners, routes, commands) can invoke it via ctx.mutate.
+     */
+    isPrivate?: boolean;
 };
 /**
  * Unified function context — single source of truth for all handle() signatures.
@@ -76,6 +82,6 @@ export type FnContext<Data extends ArcFunctionData, ExtraCtx = {}> = ElementCont
 /**
  * Handler function type for ArcFunction.
  */
-export type FnHandler<Data extends ArcFunctionData, ExtraCtx = {}> = (ctx: FnContext<Data, ExtraCtx>, params: Data["params"] extends ArcObjectAny ? $type<Data["params"]> : void) => Promise<Data["result"] extends ArcObjectAny ? $type<Data["result"]> : void>;
+export type FnHandler<Data extends ArcFunctionData, ExtraCtx = {}> = (ctx: FnContext<Data, ExtraCtx>, params: Data["params"] extends ArcObjectAny ? $type<Data["params"]> : void) => Promise<Data["results"] extends [] ? void : $type<Data["results"][number]>>;
 export {};
 //# sourceMappingURL=arc-function-data.d.ts.map

package/dist/context-element/function/arc-function.d.ts

@@ -36,8 +36,17 @@ export declare class ArcFunction<const Data extends ArcFunctionData, ExtraCtx =
     withParams<const S extends ArcRawShape>(schema: S | ArcObject<S>): ArcFunction<Merge<Data, {
         params: ArcObject<S>;
     }>, ExtraCtx>;
-    withResult<const S extends ArcRawShape>(schema: S | ArcObject<S>): ArcFunction<Merge<Data, {
-        result: ArcObject<S>;
+    withResult<const Schemas extends (ArcRawShape | ArcObjectAny)[]>(...schemas: Schemas): ArcFunction<Merge<Data, {
+        results: { [K in keyof Schemas]: Schemas[K] extends ArcObjectAny ? Schemas[K] : Schemas[K] extends ArcRawShape ? ArcObject<Schemas[K], [{
+            name: "type";
+            validator: (value: any) => false | {
+                current: "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
+                expected: "object";
+            };
+        }, {
+            name: "schema";
+            validator: (value: any) => false | (Schemas[K] extends infer T extends ArcRawShape ? { [key in keyof T]: ReturnType<T[key]["validate"]>; } : never);
+        }]> : never; };
     }>, ExtraCtx>;
     query<const Elements extends ArcContextElement<any>[]>(elements: Elements): ArcFunction<Merge<Data, {
         queryElements: Elements;
@@ -54,6 +63,15 @@ export declare class ArcFunction<const Data extends ArcFunctionData, ExtraCtx =
     description<const Desc extends string>(desc: Desc): ArcFunction<Merge<Data, {
         description: Desc;
     }>, ExtraCtx>;
+    /**
+     * Mark this function as private (server-internal). The wrapping aggregate
+     * MUST NOT expose private mutateMethod/clientQuery via commandWire — only
+     * server-side callers (listeners, routes, commands) can invoke it through
+     * `ctx.mutate.*` / `ctx.query.*`. Browser-side invocation throws.
+     */
+    private(): ArcFunction<Merge<Data, {
+        isPrivate: true;
+    }>, ExtraCtx>;
     handle<Handler extends ((ctx: FnContext<Data, ExtraCtx>, ...args: Data["params"] extends ArcObjectAny ? [$type<Data["params"]>] : []) => Promise<any>) | false>(handler: Handler): ArcFunction<Merge<Data, {
         handler: Handler;
     }>, ExtraCtx>;
@@ -62,7 +80,7 @@ export declare class ArcFunction<const Data extends ArcFunctionData, ExtraCtx =
     get protections(): FnProtection[];
     get handler(): false | Function | null;
     get params(): ArcObjectAny | null;
-    get result(): ArcObjectAny | null;
+    get results(): ArcObjectAny[];
     /**
      * Verify all protections pass for given token instances.
      * All protections must pass (logical AND).
@@ -78,12 +96,12 @@ export declare class ArcFunction<const Data extends ArcFunctionData, ExtraCtx =
      */
     toJsonSchema(): {
         params: any;
-        result: any;
+        results: any[];
     };
 }
 export declare const defaultFunctionData: {
     readonly params: null;
-    readonly result: null;
+    readonly results: [];
     readonly queryElements: [];
     readonly mutationElements: [];
     readonly protections: [];
@@ -96,7 +114,7 @@ export type DefaultFunctionData = typeof defaultFunctionData;
  */
 export declare function arcFunction(): ArcFunction<{
     readonly params: null;
-    readonly result: null;
+    readonly results: [];
     readonly queryElements: [];
     readonly mutationElements: [];
     readonly protections: [];
@@ -109,7 +127,7 @@ export declare function arcFunction(): ArcFunction<{
  */
 export declare function arcFunctionWithCtx<ExtraCtx>(): ArcFunction<{
     readonly params: null;
-    readonly result: null;
+    readonly results: [];
     readonly queryElements: [];
     readonly mutationElements: [];
     readonly protections: [];

package/dist/index.js

@@ -1884,10 +1884,11 @@ class ArcFunction {
       params: schema instanceof ArcObject ? schema : new ArcObject(schema)
     });
   }
-  withResult(schema) {
+  withResult(...schemas) {
+    const results = schemas.map((s) => s instanceof ArcObject ? s : new ArcObject(s));
     return new ArcFunction({
       ...this.data,
-      result: schema instanceof ArcObject ? schema : new ArcObject(schema)
+      results
     });
   }
   query(elements) {
@@ -1915,6 +1916,12 @@ class ArcFunction {
       description: desc
     });
   }
+  private() {
+    return new ArcFunction({
+      ...this.data,
+      isPrivate: true
+    });
+  }
   handle(handler) {
     return new ArcFunction({
       ...this.data,
@@ -1936,8 +1943,8 @@ class ArcFunction {
   get params() {
     return this.data.params;
   }
-  get result() {
-    return this.data.result;
+  get results() {
+    return this.data.results;
   }
   async verifyProtections(tokens) {
     if (!this.data.protections || this.data.protections.length === 0) {
@@ -1961,13 +1968,13 @@ class ArcFunction {
   toJsonSchema() {
     return {
       params: this.data.params?.toJsonSchema?.() ?? null,
-      result: this.data.result?.toJsonSchema?.() ?? null
+      results: this.data.results.map((r) => r.toJsonSchema())
     };
   }
 }
 var defaultFunctionData = {
   params: null,
-  result: null,
+  results: [],
   queryElements: [],
   mutationElements: [],
   protections: [],
@@ -2092,7 +2099,9 @@ class ArcAggregateElement extends ArcContextElement {
       params: configuredFn.data.params,
       handler: configuredFn.data.handler,
       queryElements: configuredFn.data.queryElements?.length ? configuredFn.data.queryElements : undefined,
-      mutationElements: configuredFn.data.mutationElements?.length ? configuredFn.data.mutationElements : undefined
+      mutationElements: configuredFn.data.mutationElements?.length ? configuredFn.data.mutationElements : undefined,
+      protections: (configuredFn.data.protections ?? []).map((p) => ({ token: p.token, protectionFn: p.check })),
+      isPrivate: configuredFn.data.isPrivate ?? false
     };
     return new ArcAggregateElement(this.name, this._id_factory, this.schema, this._events, this._protections, [...this._mutateMethods, entry], this._queryMethods, this._seeds);
   }
@@ -2112,7 +2121,10 @@ class ArcAggregateElement extends ArcContextElement {
     const configuredFn = configure(baseFn);
     const entry = {
       name: methodName,
-      handler: configuredFn.data.handler
+      params: configuredFn.data.params,
+      handler: configuredFn.data.handler,
+      protections: (configuredFn.data.protections ?? []).map((p) => ({ token: p.token, protectionFn: p.check })),
+      isPrivate: configuredFn.data.isPrivate ?? false
     };
     return new ArcAggregateElement(this.name, this._id_factory, this.schema, this._events, this._protections, this._mutateMethods, [...this._queryMethods, entry], this._seeds);
   }
@@ -2198,7 +2210,6 @@ class ArcAggregateElement extends ArcContextElement {
     return result;
   }
   queryContext(adapters) {
-    const privateQuery = this.buildPrivateQuery(adapters);
     const auth = this.getAuth(adapters);
     const AggCtor = this.Aggregate;
     const result = {};
@@ -2206,7 +2217,8 @@ class ArcAggregateElement extends ArcContextElement {
       if (!method.handler)
         continue;
       const handler = method.handler;
-      result[method.name] = (...args) => {
+      const privateQuery = this.buildPrivateQuery(adapters, method.protections ?? []);
+      const fn = (...args) => {
         const ctx = {
           $query: privateQuery,
           $auth: auth,
@@ -2214,13 +2226,16 @@ class ArcAggregateElement extends ArcContextElement {
         };
         return handler(ctx, ...args);
       };
+      fn.__isPrivate = method.isPrivate ?? false;
+      result[method.name] = fn;
     }
     return result;
   }
-  buildPrivateQuery(adapters) {
+  buildPrivateQuery(adapters, methodProtections = []) {
     const viewName = this.name;
-    const restrictions = this.getScopeRestrictions(adapters);
-    const isDenied = this.isScopeDenied(adapters);
+    const effectiveProtections = methodProtections.length > 0 ? methodProtections : this._protections;
+    const restrictions = this.getScopeRestrictions(adapters, effectiveProtections);
+    const isDenied = this.isScopeDenied(adapters, effectiveProtections);
     const findRows = async (options) => {
       if (adapters.dataStorage) {
         if (restrictions) {
@@ -2258,8 +2273,7 @@ class ArcAggregateElement extends ArcContextElement {
       }
     };
   }
-  isScopeDenied(adapters) {
-    const protections = this._protections;
+  isScopeDenied(adapters, protections = this._protections) {
     if (protections.length === 0)
       return false;
     if (!adapters.authAdapter)
@@ -2282,8 +2296,7 @@ class ArcAggregateElement extends ArcContextElement {
     }
     return { params: {}, tokenName: "" };
   }
-  getScopeRestrictions(adapters) {
-    const protections = this._protections;
+  getScopeRestrictions(adapters, protections = this._protections) {
     if (protections.length === 0)
       return null;
     if (!adapters.authAdapter)
@@ -2299,16 +2312,16 @@ class ArcAggregateElement extends ArcContextElement {
         return result ?? null;
       }
     }
-    console.log(`[Scope:${this.name}] no matching protection`);
     return null;
   }
   mutateContext(adapters) {
     const events = this._events;
-    const privateQuery = this.buildPrivateQuery(adapters);
     const auth = this.getAuth(adapters);
     const aggregateName = this.name;
-    const scopeRestrictions = this.getScopeRestrictions(adapters);
     const buildMutateMethodCtx = (method) => {
+      const methodProtections = method.protections ?? [];
+      const privateQuery = this.buildPrivateQuery(adapters, methodProtections);
+      const scopeRestrictions = this.getScopeRestrictions(adapters, methodProtections.length > 0 ? methodProtections : this._protections);
       const ctx = {};
       for (const entry of events) {
         const arcEvent = entry.event;
@@ -2350,8 +2363,11 @@ class ArcAggregateElement extends ArcContextElement {
     };
     const result = {};
     for (const method of this._mutateMethods) {
-      result[method.name] = async (params) => {
+      const fn = async (params) => {
         if (!method.handler) {
+          if (method.isPrivate) {
+            throw new Error(`Method "${aggregateName}.${method.name}" is private (server-only) and cannot be invoked from a client.`);
+          }
           if (!adapters.commandWire) {
             throw new Error(`Method "${method.name}" is server-only but no commandWire (WebSocket) is available.`);
           }
@@ -2364,6 +2380,8 @@ class ArcAggregateElement extends ArcContextElement {
         const ctx = buildMutateMethodCtx(method);
         return method.handler(ctx, params);
       };
+      fn.__isPrivate = method.isPrivate ?? false;
+      result[method.name] = fn;
     }
     return result;
   }
@@ -2399,7 +2417,7 @@ class ArcCommand extends ArcContextElement {
     this.data = data;
     this.#fn = fn ?? new ArcFunction({
       params: data.params,
-      result: null,
+      results: data.results,
       queryElements: data.queryElements,
       mutationElements: data.mutationElements,
       protections: data.protections || [],
@@ -2430,7 +2448,8 @@ class ArcCommand extends ArcContextElement {
     }, newFn);
   }
   withResult(...schemas) {
-    return new ArcCommand({ ...this.data, results: schemas }, this.#fn);
+    const newFn = this.#fn.withResult(...schemas);
+    return new ArcCommand({ ...this.data, results: newFn.data.results }, newFn);
   }
   handle(handler) {
     const newFn = new ArcFunction({
@@ -2532,7 +2551,7 @@ class ArcListener extends ArcContextElement {
     this.data = data;
     this.#fn = fn ?? new ArcFunction({
       params: null,
-      result: null,
+      results: [],
       queryElements: data.queryElements,
       mutationElements: data.mutationElements,
       protections: [],
@@ -2648,7 +2667,7 @@ class ArcRoute extends ArcContextElement {
     this.data = data;
     this.#fn = fn ?? new ArcFunction({
       params: null,
-      result: null,
+      results: [],
       queryElements: data.queryElements,
       mutationElements: data.mutationElements,
       protections: data.protections || [],
@@ -4375,19 +4394,26 @@ function buildContextAccessor(context2, adapters, contextMethod, onCall) {
     if (typeof ctxFn !== "function")
       continue;
     const methods = ctxFn.call(element2, adapters);
-    if (!methods || typeof methods !== "object")
+    if (!methods)
+      continue;
+    const elementName = element2.name;
+    if (typeof methods === "function") {
+      result[elementName] = (...args) => onCall({ element: elementName, method: "", args }, () => methods(...args));
+      continue;
+    }
+    if (typeof methods !== "object")
       continue;
     const wrapped = {};
     for (const [methodName, method] of Object.entries(methods)) {
       if (typeof method !== "function")
         continue;
-      wrapped[methodName] = (...args) => onCall({ element: element2.name, method: methodName, args }, () => method(...args));
+      wrapped[methodName] = (...args) => onCall({ element: elementName, method: methodName, args }, () => method(...args));
     }
-    result[element2.name] = wrapped;
+    result[elementName] = wrapped;
   }
   return result;
 }
-function executeDescriptor(descriptor, context2, adapters, contextMethod) {
+function executeDescriptor(descriptor, context2, adapters, contextMethod, options) {
   const element2 = context2.get(descriptor.element);
   if (!element2) {
     throw new Error(`Element '${descriptor.element}' not found in context`);
@@ -4397,10 +4423,19 @@ function executeDescriptor(descriptor, context2, adapters, contextMethod) {
     throw new Error(`Element '${descriptor.element}' has no ${contextMethod}`);
   }
   const methods = ctxFn.call(element2, adapters);
+  if (typeof methods === "function") {
+    if (options?.fromWire && methods.__isPrivate) {
+      throw new Error(`Element "${descriptor.element}" is private and not callable from a client.`);
+    }
+    return methods(...descriptor.args);
+  }
   const method = methods?.[descriptor.method];
   if (typeof method !== "function") {
     throw new Error(`Method '${descriptor.method}' not found on '${descriptor.element}'`);
   }
+  if (options?.fromWire && method.__isPrivate) {
+    throw new Error(`Method "${descriptor.element}.${descriptor.method}" is private and not callable from a client.`);
+  }
   return method(...descriptor.args);
 }
 

package/dist/model/context-accessor.d.ts

@@ -46,6 +46,12 @@ export declare function buildContextAccessor<C extends ArcContextAny, R>(context
  * @param context - ArcContext containing elements
  * @param adapters - ModelAdapters for queryContext/mutateContext
  * @param contextMethod - "queryContext" or "mutateContext"
+ * @param options - `fromWire: true` rejects calls to methods tagged
+ *                  `__isPrivate` (private mutateMethod/clientQuery). Server-side
+ *                  wire dispatchers MUST pass `fromWire: true`. Internal callers
+ *                  (replay, tests) may omit it.
  */
-export declare function executeDescriptor(descriptor: ContextDescriptor, context: ArcContextAny, adapters: ModelAdapters, contextMethod: "queryContext" | "mutateContext"): any;
+export declare function executeDescriptor(descriptor: ContextDescriptor, context: ArcContextAny, adapters: ModelAdapters, contextMethod: "queryContext" | "mutateContext", options?: {
+    fromWire?: boolean;
+}): any;
 //# sourceMappingURL=context-accessor.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arcote.tech/arc",
   "type": "module",
-  "version": "0.7.7",
+  "version": "0.7.9",
   "private": false,
   "author": "Przemysław Krasiński [arcote.tech]",
   "description": "Arc framework core rewrite with improved event emission and type safety",