akanjs 2.3.11 → 2.3.12-rc.0

package/fetch/client/fetchClient.ts

@@ -101,6 +101,9 @@ export class FetchClient {
               : undefined,
           getGuards: signal.getGuards ?? current.getGuards,
           cruGuards: signal.cruGuards ?? current.cruGuards,
+          createGuards: signal.createGuards ?? current.createGuards,
+          updateGuards: signal.updateGuards ?? current.updateGuards,
+          removeGuards: signal.removeGuards ?? current.removeGuards,
         }
       : signal;
   }
@@ -353,6 +356,10 @@ export class FetchClient {
       modelId: `${refName}Id`,
       lightModel: `light${capRefName}`,
     };
+    
+    const createGuards = signal.createGuards ?? signal.cruGuards;
+    const updateGuards = signal.updateGuards ?? signal.cruGuards;
+    const removeGuards = signal.removeGuards ?? signal.cruGuards;
     const endpoint: { [key: string]: SerializedEndpoint } = {};
     if (signal.getGuards) {
       endpoint[names.model] = {
@@ -368,13 +375,15 @@ export class FetchClient {
         guards: signal.getGuards,
       };
     }
-    if (signal.cruGuards) {
+    if (createGuards) {
       endpoint[names.createModel] = {
         type: "mutation",
         args: [{ type: "body", name: "data", refName, modelType: "input" }],
         returns: { refName, modelType: "full" },
-        guards: signal.cruGuards,
+        guards: createGuards,
       };
+    }
+    if (updateGuards) {
       endpoint[names.updateModel] = {
         type: "mutation",
         args: [
@@ -382,13 +391,15 @@ export class FetchClient {
           { type: "body", name: "data", refName, modelType: "input" },
         ],
         returns: { refName, modelType: "full" },
-        guards: signal.cruGuards,
+        guards: updateGuards,
       };
+    }
+    if (removeGuards) {
       endpoint[names.removeModel] = {
         type: "mutation",
         args: [{ type: "param", name: names.modelId, refName: "ID" }],
         returns: { refName, modelType: "full" },
-        guards: signal.cruGuards,
+        guards: removeGuards,
       };
     }
     return endpoint;
@@ -414,7 +425,9 @@ export class FetchClient {
       this.#setHandlerFactory(key, () => this.#makeHttpFn(key, value, signal.prefix));
     });
 
-    if (signal.cruGuards) {
+    const anyCruGuards = signal.cruGuards ?? signal.createGuards ?? signal.updateGuards ?? signal.removeGuards;
+    const updateGuards = signal.updateGuards ?? signal.cruGuards;
+    if (anyCruGuards) {
       this.#setHandlerFactory(
         names.viewModel,
         () =>
@@ -461,15 +474,17 @@ export class FetchClient {
             return { refName, [`${refName}Obj`]: modelObj, [`${refName}ViewAt`]: new Date() };
           }) as FetchHandler,
       );
-      this.#setHandlerFactory(
-        names.mergeModel,
-        () =>
-          (async (modelOrId: string | { id: string }, data: UnknownRecord, option?: FetchPolicy) => {
-            const id = typeof modelOrId === "string" ? modelOrId : modelOrId.id;
-            const updateFn = this.#requireHandler(names.updateModel, names.mergeModel);
-            return await updateFn(id, data, option);
-          }) as FetchHandler,
-      );
+      if (updateGuards) {
+        this.#setHandlerFactory(
+          names.mergeModel,
+          () =>
+            (async (modelOrId: string | { id: string }, data: UnknownRecord, option?: FetchPolicy) => {
+              const id = typeof modelOrId === "string" ? modelOrId : modelOrId.id;
+              const updateFn = this.#requireHandler(names.updateModel, names.mergeModel);
+              return await updateFn(id, data, option);
+            }) as FetchHandler,
+        );
+      }
     }
 
     this.#setHandlerFactory(

package/fetch/serializer/fetch.serializer.ts

@@ -102,6 +102,16 @@ export class FetchSerializer {
       ...(sliceCls.cruGuards.filter((g) => g.name !== "None").length
         ? { cruGuards: sliceCls.cruGuards.map((g) => g.name) }
         : {}),
+
+      ...(sliceCls.createGuards !== sliceCls.cruGuards && sliceCls.createGuards.filter((g) => g.name !== "None").length
+        ? { createGuards: sliceCls.createGuards.map((g) => g.name) }
+        : {}),
+      ...(sliceCls.updateGuards !== sliceCls.cruGuards && sliceCls.updateGuards.filter((g) => g.name !== "None").length
+        ? { updateGuards: sliceCls.updateGuards.map((g) => g.name) }
+        : {}),
+      ...(sliceCls.removeGuards !== sliceCls.cruGuards && sliceCls.removeGuards.filter((g) => g.name !== "None").length
+        ? { removeGuards: sliceCls.removeGuards.map((g) => g.name) }
+        : {}),
       endpoint,
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.3.11",
+  "version": "2.3.12-rc.0",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/server/resolver/signal.resolver.ts

@@ -232,14 +232,14 @@ export class SignalResolver {
         });
 
       endpointObj[`create${capitalizedRefName}`] = (builder as any)
-        .mutation(cnst.full, { guards: sliceCls.cruGuards })
+        .mutation(cnst.full, { guards: sliceCls.createGuards })
         .body("data", cnst.input)
         .exec(async function (this: any, data: any) {
           return await this[serviceName].__create(data);
         });
 
       endpointObj[`update${capitalizedRefName}`] = (builder as any)
-        .mutation(cnst.full, { guards: sliceCls.cruGuards })
+        .mutation(cnst.full, { guards: sliceCls.updateGuards })
         .param(`${refName}Id`, ID)
         .body("data", cnst.input)
         .exec(async function (this: any, id: string, data: any) {
@@ -247,7 +247,7 @@ export class SignalResolver {
         });
 
       endpointObj[`remove${capitalizedRefName}`] = (builder as any)
-        .mutation(cnst.full, { guards: sliceCls.cruGuards })
+        .mutation(cnst.full, { guards: sliceCls.removeGuards })
         .param(`${refName}Id`, ID)
         .exec(async function (this: any, id: string) {
           return await this[serviceName].__remove(id);

package/signal/serializer/fetch.serializer.ts

@@ -99,6 +99,16 @@ export class FetchSerializer {
       ...(sliceCls.cruGuards.filter((g) => g.name !== "None").length
         ? { cruGuards: sliceCls.cruGuards.map((g) => g.name) }
         : {}),
+
+      ...(sliceCls.createGuards !== sliceCls.cruGuards && sliceCls.createGuards.filter((g) => g.name !== "None").length
+        ? { createGuards: sliceCls.createGuards.map((g) => g.name) }
+        : {}),
+      ...(sliceCls.updateGuards !== sliceCls.cruGuards && sliceCls.updateGuards.filter((g) => g.name !== "None").length
+        ? { updateGuards: sliceCls.updateGuards.map((g) => g.name) }
+        : {}),
+      ...(sliceCls.removeGuards !== sliceCls.cruGuards && sliceCls.removeGuards.filter((g) => g.name !== "None").length
+        ? { removeGuards: sliceCls.removeGuards.map((g) => g.name) }
+        : {}),
       endpoint,
     };
   }

package/signal/signalContext.ts

@@ -341,6 +341,11 @@ export class SignalContext<
   getEnv() {
     return this.#env;
   }
+  getArg<T = unknown>(argName: string): T | undefined {
+    const index = this.endpointInfo.args.findIndex((arg) => arg.name === argName);
+    if (index === -1) return undefined;
+    return this.args[index] as T;
+  }
 }
 
 export class HttpExecutionContext<Appended = unknown> {

package/signal/slice.ts

@@ -35,6 +35,9 @@ export type SliceCls<
   [SLICE_META]: SliceInfoObj;
   getGuards: GuardCls[];
   cruGuards: GuardCls[];
+  createGuards: GuardCls[];
+  updateGuards: GuardCls[];
+  removeGuards: GuardCls[];
 };
 
 interface RootSliceOption {
@@ -42,6 +45,9 @@ interface RootSliceOption {
     root?: Cls<Guard> | Cls<Guard>[];
     get?: Cls<Guard> | Cls<Guard>[];
     cru?: Cls<Guard> | Cls<Guard>[];
+    create?: Cls<Guard> | Cls<Guard>[];
+    update?: Cls<Guard> | Cls<Guard>[];
+    remove?: Cls<Guard> | Cls<Guard>[];
   };
   prefix?: string;
 }
@@ -123,21 +129,14 @@ export function slice<
     srv.cnst.insight,
     srv.db.filter,
   );
-  const rootGuards = option.guards?.root
-    ? Array.isArray(option.guards.root)
-      ? option.guards.root
-      : [option.guards.root]
-    : [];
-  const getGuards = option.guards?.get
-    ? Array.isArray(option.guards.get)
-      ? option.guards.get
-      : [option.guards.get]
-    : [];
-  const cruGuards = option.guards?.cru
-    ? Array.isArray(option.guards.cru)
-      ? option.guards.cru
-      : [option.guards.cru]
-    : [];
+  const toGuards = (guard?: Cls<Guard> | Cls<Guard>[]) => (guard ? (Array.isArray(guard) ? guard : [guard]) : []);
+  const rootGuards = toGuards(option.guards?.root);
+  const getGuards = toGuards(option.guards?.get);
+  const cruGuards = toGuards(option.guards?.cru);
+
+  const createGuards = option.guards?.create ? toGuards(option.guards.create) : cruGuards;
+  const updateGuards = option.guards?.update ? toGuards(option.guards.update) : cruGuards;
+  const removeGuards = option.guards?.remove ? toGuards(option.guards.remove) : cruGuards;
   const srvKeys = [
     ...new Set([...Object.keys(srv.srvMap), ...libSlices.flatMap((libSlice) => Object.keys(libSlice.srv.srvMap))]),
   ];
@@ -148,6 +147,9 @@ export function slice<
     static srv = srv;
     static getGuards = getGuards;
     static cruGuards = cruGuards;
+    static createGuards = createGuards;
+    static updateGuards = updateGuards;
+    static removeGuards = removeGuards;
     static [SLICE_META] = Object.assign(
       {
         [""]: init({ guards: rootGuards })

package/signal/types.ts

@@ -129,6 +129,9 @@ export interface SerializedSignal {
   filter?: SerializedFilter;
   getGuards?: string[];
   cruGuards?: string[];
+  createGuards?: string[];
+  updateGuards?: string[];
+  removeGuards?: string[];
 }
 
 export type SignalType = "restapi" | "websocket";

package/types/signal/signalContext.d.ts

@@ -48,6 +48,7 @@ export declare class SignalContext<Ctx extends HttpExecutionContext | WebSocketE
     getWebSocketContext<Appended = unknown>(): WebSocketExecutionContext<Appended>;
     getRoomId(key: string): string;
     getEnv(): Env;
+    getArg<T = unknown>(argName: string): T | undefined;
 }
 export declare class HttpExecutionContext<Appended = unknown> {
     #private;

package/types/signal/slice.d.ts

@@ -27,12 +27,18 @@ export type SliceCls<SrvModule extends ServiceModel = ServiceModel, SliceInfoObj
     [SLICE_META]: SliceInfoObj;
     getGuards: GuardCls[];
     cruGuards: GuardCls[];
+    createGuards: GuardCls[];
+    updateGuards: GuardCls[];
+    removeGuards: GuardCls[];
 };
 interface RootSliceOption {
     guards?: {
         root?: Cls<Guard> | Cls<Guard>[];
         get?: Cls<Guard> | Cls<Guard>[];
         cru?: Cls<Guard> | Cls<Guard>[];
+        create?: Cls<Guard> | Cls<Guard>[];
+        update?: Cls<Guard> | Cls<Guard>[];
+        remove?: Cls<Guard> | Cls<Guard>[];
     };
     prefix?: string;
 }

package/types/signal/types.d.ts

@@ -122,6 +122,9 @@ export interface SerializedSignal {
     filter?: SerializedFilter;
     getGuards?: string[];
     cruGuards?: string[];
+    createGuards?: string[];
+    updateGuards?: string[];
+    removeGuards?: string[];
 }
 export type SignalType = "restapi" | "websocket";
 export type WebsocketReqData = {

package/types/webkit/usePushNotification.d.ts

@@ -1,6 +1,15 @@
-import { type FirebaseOptions } from "firebase/app";
 export type PushNotificationPlatform = "web" | "ios" | "android";
 export type PushNotificationProvider = "fcm";
+export interface FirebaseOptions {
+    apiKey?: string;
+    authDomain?: string;
+    databaseURL?: string;
+    projectId?: string;
+    storageBucket?: string;
+    messagingSenderId?: string;
+    appId?: string;
+    measurementId?: string;
+}
 export interface PushToken {
     token: string;
     platform: PushNotificationPlatform;

package/webkit/usePushNotification.tsx

@@ -2,13 +2,22 @@
 
 import { router } from "akanjs/client";
 import { loadCapacitorDevice, loadCapacitorFcm, loadCapacitorPushNotifications } from "akanjs/client/capacitor";
-import { getApps, initializeApp, type FirebaseOptions } from "firebase/app";
-import { getMessaging, getToken as getFirebaseToken } from "firebase/messaging";
 import { useEffect } from "react";
 
 export type PushNotificationPlatform = "web" | "ios" | "android";
 export type PushNotificationProvider = "fcm";
 
+export interface FirebaseOptions {
+  apiKey?: string;
+  authDomain?: string;
+  databaseURL?: string;
+  projectId?: string;
+  storageBucket?: string;
+  messagingSenderId?: string;
+  appId?: string;
+  measurementId?: string;
+}
+
 export interface PushToken {
   token: string;
   platform: PushNotificationPlatform;
@@ -84,9 +93,18 @@ const getNativeToken = async (options?: { retries?: number }): Promise<PushToken
 const getWebToken = async (): Promise<PushToken | undefined> => {
   if (!isWebRuntime() || !("serviceWorker" in navigator)) return undefined;
   const firebaseConfig = getFirebaseConfig();
-  if (!firebaseConfig?.apiKey || !firebaseConfig.projectId || !firebaseConfig.messagingSenderId || !firebaseConfig.appId) {
+  if (
+    !firebaseConfig?.apiKey ||
+    !firebaseConfig.projectId ||
+    !firebaseConfig.messagingSenderId ||
+    !firebaseConfig.appId
+  ) {
     return undefined;
   }
+  const [{ getApps, initializeApp }, { getToken: getFirebaseToken, getMessaging }] = await Promise.all([
+    import("firebase/app"),
+    import("firebase/messaging"),
+  ]);
   const firebase = getApps()[0] ?? initializeApp(firebaseConfig);
   const messaging = getMessaging(firebase);
   const serviceWorkerRegistration = await navigator.serviceWorker.register("/firebase-messaging-sw.js");