@arcote.tech/arc-adapter-db-sqlite 0.7.7 → 0.7.9

package/dist/index.js

@@ -3000,10 +3000,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) {
@@ -3031,6 +3032,12 @@ class ArcFunction {
       description: desc
     });
   }
+  private() {
+    return new ArcFunction({
+      ...this.data,
+      isPrivate: true
+    });
+  }
   handle(handler) {
     return new ArcFunction({
       ...this.data,
@@ -3052,8 +3059,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) {
@@ -3077,7 +3084,7 @@ class ArcFunction {
   toJsonSchema() {
     return {
       params: this.data.params?.toJsonSchema?.() ?? null,
-      result: this.data.result?.toJsonSchema?.() ?? null
+      results: this.data.results.map((r) => r.toJsonSchema())
     };
   }
 }
@@ -3129,7 +3136,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 || [],
@@ -3160,7 +3167,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({
@@ -3251,7 +3259,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: [],
@@ -3357,7 +3365,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 || [],
@@ -4090,19 +4098,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`);
@@ -4112,10 +4127,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcote.tech/arc-adapter-db-sqlite",
-  "version": "0.7.7",
+  "version": "0.7.9",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,7 +20,7 @@
     "test": "bun test"
   },
   "peerDependencies": {
-    "@arcote.tech/arc": "^0.7.7"
+    "@arcote.tech/arc": "^0.7.9"
   },
   "devDependencies": {
     "typescript": "^5.0.0"