akanjs 2.1.0-rc.6 → 2.1.0-rc.8

package/capacitor.base.config.ts

@@ -0,0 +1,88 @@
+import os from "node:os";
+import type { CapacitorConfig } from "@capacitor/cli";
+import type { AkanMobileTargetConfig, AppScanResult } from "akanjs";
+
+const getLocalIP = () => {
+  const interfaces = os.networkInterfaces();
+  for (const interfaceName in interfaces) {
+    const iface = interfaces[interfaceName];
+    if (!iface) continue;
+    for (const alias of iface) {
+      if (alias.family === "IPv4" && !alias.internal) return alias.address;
+    }
+  }
+  return "127.0.0.1"; 
+};
+
+const normalizeBasePath = (basePath: string | undefined) => basePath?.replace(/^\/+|\/+$/g, "");
+
+const routeBasePaths = (appInfo: AppScanResult) =>
+  new Set(
+    appInfo.routes
+      .map((route) => route.replace(/^\.\//, "").split("/")[0])
+      .filter((segment): segment is string => !!segment && !segment.startsWith("_") && !segment.startsWith("(")),
+  );
+
+const resolveTarget = (appInfo: AppScanResult, targetName = process.env.AKAN_MOBILE_TARGET) => {
+  const targets = appInfo.akanConfig.mobile.targets;
+  if (!targets || Object.keys(targets).length === 0) throw new Error("Akan mobile target metadata is missing.");
+  if (targetName) {
+    const target = targets[targetName];
+    if (!target) {
+      const basePath = normalizeBasePath(targetName);
+      const [template] = Object.values(targets);
+      if (basePath && template && routeBasePaths(appInfo).has(basePath))
+        return { ...template, name: basePath, basePath };
+      throw new Error(`Akan mobile target '${targetName}' was not found.`);
+    }
+    return target;
+  }
+  const entries = Object.entries(targets);
+  if (entries.length !== 1) throw new Error("AKAN_MOBILE_TARGET is required when multiple mobile targets exist.");
+  return entries[0]?.[1] as AkanMobileTargetConfig;
+};
+
+const localCsrUrl = (ip: string, target: AkanMobileTargetConfig) => {
+  const basePath = normalizeBasePath(target.basePath);
+  const port = process.env.AKAN_PUBLIC_CLIENT_PORT ?? process.env.PORT ?? "8282";
+  return `http://${ip}:${port}/${basePath ? `${basePath}` : ""}?csr=true`;
+};
+
+export const withBase = (
+  configImp: (config: CapacitorConfig, target: AkanMobileTargetConfig) => CapacitorConfig = (config) => config,
+  appData?: AppScanResult,
+  targetName?: string,
+) => {
+  const ip = getLocalIP();
+  const appInfo = appData;
+  if (!appInfo) throw new Error("withBase requires apps/<app>/akan.app.json metadata.");
+  const target = resolveTarget(appInfo, targetName);
+  const baseConfig: CapacitorConfig = {
+    ...target,
+    appId: target.appId,
+    appName: target.appName,
+    webDir: "dist",
+    server:
+      process.env.APP_OPERATION_MODE !== "release"
+        ? {
+            androidScheme: "http",
+            url: localCsrUrl(ip, target),
+            cleartext: true,
+            allowNavigation: [ip, "localhost"],
+          }
+        : {
+            allowNavigation: ["*"],
+          },
+    plugins: {
+      CapacitorCookies: { enabled: true },
+      ...target.plugins,
+    },
+    android: {
+      ...target.android,
+    },
+    ios: {
+      ...target.ios,
+    },
+  };
+  return configImp(baseConfig, target);
+};

package/client/device.ts

@@ -50,6 +50,11 @@ const getRenderMode = () => globalWithProcess.process?.env?.AKAN_PUBLIC_RENDER_E
 
 const getBrowserLanguage = () => globalThis.navigator?.language?.split("-")[0] ?? "en";
 
+const isNativeTarget = () => {
+  if (typeof window === "undefined") return false;
+  return Boolean((window as typeof window & { __AKAN_MOBILE_TARGET__?: unknown }).__AKAN_MOBILE_TARGET__);
+};
+
 export const isMobileDevice = () => {
   if (typeof navigator === "undefined") return false;
   if (typeof window !== "undefined" && window.matchMedia?.("(hover: none) and (pointer: coarse)")?.matches) return true;
@@ -88,7 +93,7 @@ export class Device {
     supportLanguages?: string[] | readonly string[];
   }) {
     if (Device.instance) return Device.instance;
-    if (getRenderMode() !== "csr") {
+    if (getRenderMode() !== "csr" || !isNativeTarget()) {
       const device = createWebDevice({ lang, supportLanguages });
       Device.instance = device;
       return device;

package/document/filterMeta.ts

@@ -93,6 +93,11 @@ export const getFilterSortByKey = (modelRef: FilterCls, key: string) => {
   return filterMeta.sort[key];
 };
 
+export const fillMissingFilterArgs = (filterInfo: FilterInfo, args: unknown[]) => {
+  if (args.length >= filterInfo.args.length) return args;
+  return [...args, ...Array(filterInfo.args.length - args.length).fill(undefined)];
+};
+
 export type BaseFilterSortKey = "latest" | "oldest";
 export type BaseFilterQueryKey = "any";
 export type BaseFilterKey = BaseFilterSortKey | BaseFilterQueryKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.1.0-rc.6",
+  "version": "2.1.0-rc.8",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -95,6 +95,11 @@
       "import": "./client/capacitor.ts",
       "default": "./client/capacitor.ts"
     },
+    "./capacitor.base.config": {
+      "types": "./types/capacitor.base.config.d.ts",
+      "import": "./capacitor.base.config.ts",
+      "default": "./capacitor.base.config.ts"
+    },
     "./webkit": {
       "types": "./types/webkit/index.d.ts",
       "import": "./webkit/index.ts",
@@ -159,6 +164,7 @@
     "@capacitor/app": "^8.1.0",
     "@capacitor/browser": "^8.0.3",
     "@capacitor/camera": "^8.2.0",
+    "@capacitor/cli": "^8.3.4",
     "@capacitor/core": "^8.3.4",
     "@capacitor/device": "^8.0.2",
     "@capacitor/geolocation": "^8.2.0",
@@ -211,6 +217,9 @@
     "@capacitor/camera": {
       "optional": true
     },
+    "@capacitor/cli": {
+      "optional": true
+    },
     "@capacitor/core": {
       "optional": true
     },

package/server/di/predefinedAdaptor.ts

@@ -10,11 +10,11 @@ import {
   ConsoleLogger,
   type DatabaseAdaptor,
   DatabaseAdaptorRole,
+  JsonCompressor,
   LibsqlDatabase,
   type LoggingAdaptor,
   LoggingAdaptorRole,
   PostgresDatabase,
-  JsonCompressor,
   type QueueAdaptor,
   QueueAdaptorRole,
   RedisCache,

package/server/resolver/database.resolver.ts

@@ -11,6 +11,7 @@ import {
   DocumentSchema,
   documentQueryHelper,
   type FindQueryOption,
+  fillMissingFilterArgs,
   getFilterInfoByKey,
   getFilterMeta,
   getFilterSortByKey,
@@ -338,7 +339,8 @@ export class DatabaseResolver {
       const filterInfo = getFilterInfoByKey(database.filter, queryKey);
       const queryFn = filterInfo.queryFn;
       if (!queryFn) throw new Error(`No query function for key: ${queryKey}`);
-      const query = queryFn(...(hasQueryOption ? args.slice(0, -1) : args), documentQueryHelper);
+      const queryArgs = fillMissingFilterArgs(filterInfo, hasQueryOption ? args.slice(0, -1) : args);
+      const query = queryFn(...queryArgs, documentQueryHelper);
       const queryOption = hasQueryOption ? lastArg : {};
       return { query, queryOption };
     };
@@ -371,18 +373,19 @@ export class DatabaseResolver {
           return (this as unknown as DatabaseInstance).__pickId(query, queryOption);
         },
         [`exists${capitalize(queryKey)}`]: async function (...args: any) {
-          const query = queryFn(...args, documentQueryHelper);
+          const query = queryFn(...fillMissingFilterArgs(filterInfo, args), documentQueryHelper);
           return (this as unknown as DatabaseInstance).__exists(query);
         },
         [`count${capitalize(queryKey)}`]: async function (...args: any) {
-          const query = queryFn(...args, documentQueryHelper);
+          const query = queryFn(...fillMissingFilterArgs(filterInfo, args), documentQueryHelper);
           return (this as unknown as DatabaseInstance).__count(query);
         },
         [`insight${capitalize(queryKey)}`]: async function (...args: any) {
-          const query = queryFn(...args, documentQueryHelper);
+          const query = queryFn(...fillMissingFilterArgs(filterInfo, args), documentQueryHelper);
           return (this as unknown as DatabaseInstance).__insight(query);
         },
-        [`query${capitalize(queryKey)}`]: (...args: any) => queryFn(...args, documentQueryHelper),
+        [`query${capitalize(queryKey)}`]: (...args: any) =>
+          queryFn(...fillMissingFilterArgs(filterInfo, args), documentQueryHelper),
       });
     });
     applyMixins(DatabaseModelInstance, [database.model]);

package/server/resolver/service.resolver.ts

@@ -8,6 +8,7 @@ import {
   type Doc,
   documentQueryHelper,
   type FindQueryOption,
+  fillMissingFilterArgs,
   getFilterInfoByKey,
   getFilterMeta,
   type ListQueryOption,
@@ -116,9 +117,11 @@ export class ServiceResolver {
           typeof lastArg.skip === "number" ||
           typeof lastArg.limit === "number" ||
           typeof lastArg.sort === "string");
-      const queryFn = getFilterInfoByKey(database.filter, queryKey).queryFn;
+      const filterInfo = getFilterInfoByKey(database.filter, queryKey);
+      const queryFn = filterInfo.queryFn;
       if (!queryFn) throw new Error(`No query function for key: ${queryKey}`);
-      const query = queryFn(...(hasQueryOption ? args.slice(0, -1) : args), documentQueryHelper);
+      const queryArgs = fillMissingFilterArgs(filterInfo, hasQueryOption ? args.slice(0, -1) : args);
+      const query = queryFn(...queryArgs, documentQueryHelper);
       const queryOption = hasQueryOption ? lastArg : {};
       return { query, queryOption };
     };
@@ -167,7 +170,7 @@ export class ServiceResolver {
           return this.__insight(query);
         },
         [`query${capitalize(queryKey)}`]: function (this: DatabaseService, ...args: any) {
-          return queryFn(...args, documentQueryHelper);
+          return queryFn(...fillMissingFilterArgs(filterInfo, args), documentQueryHelper);
         },
       });
     });

package/service/predefinedAdaptor/database.adaptor.ts

@@ -1003,7 +1003,8 @@ export class SqliteDocumentStore {
     const store = this;
     const original = JSON.parse(JSON.stringify(sanitizeJson(originalData) ?? {})) as Record<string, unknown>;
     const isNew = !originalData.id;
-    const doc = Object.assign(Object.create(this.database.doc.prototype), data);
+    const hydratedData = isNew ? this.prepareDocument(data) : data;
+    const doc = Object.assign(Object.create(this.database.doc.prototype), hydratedData);
     Object.defineProperties(doc, {
       set: {
         value(patch: DocumentRecord) {

package/types/capacitor.base.config.d.ts

@@ -0,0 +1,3 @@
+import type { CapacitorConfig } from "@capacitor/cli";
+import type { AkanMobileTargetConfig, AppScanResult } from "akanjs";
+export declare const withBase: (configImp?: (config: CapacitorConfig, target: AkanMobileTargetConfig) => CapacitorConfig, appData?: AppScanResult, targetName?: string) => CapacitorConfig;

package/types/document/filterMeta.d.ts

@@ -18,6 +18,7 @@ export declare const setFilterMeta: (filterRef: Cls<unknown, {
 export declare const getFilterInfoByKey: <ArgNames extends string[] = [], Args extends any[] = any[], Model = any>(modelRef: FilterCls, key: string) => FilterInfo<ArgNames, Args, Model>;
 export declare const setFilterInfoByKey: <ArgNames extends string[] = [], Args extends any[] = any[], Model = any>(modelRef: Cls<Model>, key: string, filterInfo: FilterInfo<ArgNames, Args, Model>) => void;
 export declare const getFilterSortByKey: (modelRef: FilterCls, key: string) => unknown;
+export declare const fillMissingFilterArgs: (filterInfo: FilterInfo, args: unknown[]) => any[];
 export type BaseFilterSortKey = "latest" | "oldest";
 export type BaseFilterQueryKey = "any";
 export type BaseFilterKey = BaseFilterSortKey | BaseFilterQueryKey;

package/types/server/di/predefinedAdaptor.d.ts

@@ -1,5 +1,5 @@
 import type { DatabaseMode } from "akanjs";
-import { type AdaptorCls, BlobStorage, type CacheAdaptor, type CompressAdaptor, ConsoleLogger, type DatabaseAdaptor, type LoggingAdaptor, JsonCompressor, type QueueAdaptor, type ScheduleAdaptor, Scheduler, SolidCache, SolidPubSub, SolidQueue, SqliteDatabase, type StorageAdaptor, type WebsocketAdaptor } from "akanjs/service";
+import { type AdaptorCls, BlobStorage, type CacheAdaptor, type CompressAdaptor, ConsoleLogger, type DatabaseAdaptor, JsonCompressor, type LoggingAdaptor, type QueueAdaptor, type ScheduleAdaptor, Scheduler, SolidCache, SolidPubSub, SolidQueue, SqliteDatabase, type StorageAdaptor, type WebsocketAdaptor } from "akanjs/service";
 export interface PredefinedAdaptor {
     database: AdaptorCls<DatabaseAdaptor>;
     cache: AdaptorCls<CacheAdaptor>;