akanjs 2.0.3 → 2.0.5-canary.0

package/cli/index.js

@@ -865,7 +865,7 @@ import {
   spawn
 } from "child_process";
 import { readFileSync as readFileSync3 } from "fs";
-import { mkdir as mkdir2, readdir as readDirEntries, stat as stat2 } from "fs/promises";
+import { copyFile, mkdir as mkdir2, readdir as readDirEntries, stat as stat2 } from "fs/promises";
 import path7 from "path";
 var {$ } = globalThis.Bun;
 import chalk4 from "chalk";
@@ -2294,6 +2294,39 @@ ${summary.join(", ")} found${output.join(`
   }
 }
 
+var staticTemplateFileExtensions = new Set([
+  ".avif",
+  ".bmp",
+  ".cjs",
+  ".css",
+  ".eot",
+  ".gif",
+  ".html",
+  ".ico",
+  ".jpeg",
+  ".jpg",
+  ".js",
+  ".json",
+  ".map",
+  ".md",
+  ".mjs",
+  ".mp3",
+  ".mp4",
+  ".ogg",
+  ".otf",
+  ".pdf",
+  ".png",
+  ".svg",
+  ".ttf",
+  ".txt",
+  ".wasm",
+  ".wav",
+  ".webm",
+  ".webp",
+  ".woff",
+  ".woff2",
+  ".xml"
+]);
 var execEmoji = {
   workspace: "\uD83C\uDFE0",
   app: "\uD83D\uDE80",
@@ -2689,6 +2722,15 @@ class Executor {
       const convertedContent = Object.entries(dict).reduce((data, [key, value]) => data.replace(new RegExp(`<%= ${key} %>`, "g"), value), content);
       this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
       return this.writeFile(convertedTargetPath, convertedContent, { overwrite });
+    } else if (staticTemplateFileExtensions.has(path7.extname(targetPath).toLowerCase())) {
+      const convertedTargetPath = Object.entries(dict).reduce((path8, [key, value]) => path8.replace(new RegExp(`__${key}__`, "g"), value), targetPath);
+      const writePath = this.getPath(convertedTargetPath);
+      const dirname3 = path7.dirname(writePath);
+      if (!await FileSys.dirExists(dirname3))
+        await mkdir2(dirname3, { recursive: true });
+      await copyFile(templatePath, writePath);
+      this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
+      return { filePath: writePath, content: "" };
     } else
       return null;
   }
@@ -10051,7 +10093,7 @@ class PackageRunner extends runner("package") {
     const scanner = await TypeScriptDependencyScanner.from(pkg);
     const { npmDeps, npmDevDeps, missingDeps } = await scanner.getPackageBuildDependencies(pkg.name);
     const packageRuntimeDependencies = { akanjs: ["daisyui"] };
-    const packageRuntimeDevDependencies = { akanjs: ["@biomejs/biome"] };
+    const packageRuntimeDevDependencies = { akanjs: ["@biomejs/biome", "@types/bun"] };
     const forcedRuntimeDeps = packageRuntimeDependencies[pkg.name] ?? [];
     const forcedRuntimeDevDeps = packageRuntimeDevDependencies[pkg.name] ?? [];
     const packageRuntimeDeps = [...new Set([...npmDeps, ...forcedRuntimeDeps])];

package/cli/package/package.runner.ts

@@ -39,7 +39,7 @@ export class PackageRunner extends runner("package") {
     const scanner = await TypeScriptDependencyScanner.from(pkg);
     const { npmDeps, npmDevDeps, missingDeps } = await scanner.getPackageBuildDependencies(pkg.name);
     const packageRuntimeDependencies: Record<string, string[]> = { akanjs: ["daisyui"] };
-    const packageRuntimeDevDependencies: Record<string, string[]> = { akanjs: ["@biomejs/biome"] };
+    const packageRuntimeDevDependencies: Record<string, string[]> = { akanjs: ["@biomejs/biome", "@types/bun"] };
     const forcedRuntimeDeps = packageRuntimeDependencies[pkg.name] ?? [];
     const forcedRuntimeDevDeps = packageRuntimeDevDependencies[pkg.name] ?? [];
     const packageRuntimeDeps = [...new Set([...npmDeps, ...forcedRuntimeDeps])];

package/cli/templates/app/env/env.server.develop.ts.template

@@ -5,5 +5,4 @@ import type { ModulesOptions } from "../lib/option";
 export const env: ModulesOptions = {
   ...getEnv(),
   hostname: null,
-  redis: {},
 };

package/cli/templates/app/env/env.server.local.ts.template

@@ -5,7 +5,6 @@ import type { ModulesOptions } from "../lib/option";
 export const env: ModulesOptions = {
   ...getEnv(),
   hostname: null,
-  redis: {},
   security: {
     verifies: [["password", "phone", "naver", "kakao"]],
     sso: {},

package/cli/templates/app/env/env.server.main.ts.template

@@ -5,5 +5,4 @@ import type { ModulesOptions } from "../lib/option";
 export const env: ModulesOptions = {
   ...getEnv(),
   hostname: null,
-  redis: {},
 };

package/devkit/executors.ts

@@ -8,7 +8,7 @@ import {
   spawn,
 } from "node:child_process";
 import { readFileSync } from "node:fs";
-import { mkdir, readdir as readDirEntries, stat } from "node:fs/promises";
+import { copyFile, mkdir, readdir as readDirEntries, stat } from "node:fs/promises";
 import path from "node:path";
 import {
   capitalize,
@@ -30,6 +30,40 @@ import { Spinner } from "./spinner";
 import { TypeChecker } from "./typeChecker";
 import type { FileContent, PackageJson, TsConfigJson } from "./types";
 
+const staticTemplateFileExtensions = new Set([
+  ".avif",
+  ".bmp",
+  ".cjs",
+  ".css",
+  ".eot",
+  ".gif",
+  ".html",
+  ".ico",
+  ".jpeg",
+  ".jpg",
+  ".js",
+  ".json",
+  ".map",
+  ".md",
+  ".mjs",
+  ".mp3",
+  ".mp4",
+  ".ogg",
+  ".otf",
+  ".pdf",
+  ".png",
+  ".svg",
+  ".ttf",
+  ".txt",
+  ".wasm",
+  ".wav",
+  ".webm",
+  ".webp",
+  ".woff",
+  ".woff2",
+  ".xml",
+]);
+
 export const execEmoji = {
   workspace: "🏠",
   app: "🚀",
@@ -451,6 +485,17 @@ export class Executor {
       );
       this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
       return this.writeFile(convertedTargetPath, convertedContent, { overwrite });
+    } else if (staticTemplateFileExtensions.has(path.extname(targetPath).toLowerCase())) {
+      const convertedTargetPath = Object.entries(dict).reduce(
+        (path, [key, value]) => path.replace(new RegExp(`__${key}__`, "g"), value),
+        targetPath,
+      );
+      const writePath = this.getPath(convertedTargetPath);
+      const dirname = path.dirname(writePath);
+      if (!(await FileSys.dirExists(dirname))) await mkdir(dirname, { recursive: true });
+      await copyFile(templatePath, writePath);
+      this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
+      return { filePath: writePath, content: "" };
     } else return null;
   }
   async _applyTemplate({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.0.3",
+  "version": "2.0.5-canary.0",
   "sourceType": "module",
   "type": "module",
   "bin": {
@@ -19,103 +19,145 @@
   },
   "exports": {
     ".": {
+      "types": "./types/index.d.ts",
       "import": "./index.ts",
-      "types": "./index.ts",
       "default": "./index.ts"
     },
     "./package.json": "./package.json",
     "./capacitor.base.config": {
+      "types": "./types/devkit/capacitor.base.config.d.ts",
       "import": "./devkit/capacitor.base.config.ts",
-      "types": "./devkit/capacitor.base.config.ts",
       "default": "./devkit/capacitor.base.config.ts"
     },
     "./base": {
+      "types": "./types/base/index.d.ts",
       "import": "./base/index.ts",
-      "types": "./base/index.ts",
       "default": "./base/index.ts"
     },
     "./common": {
+      "types": "./types/common/index.d.ts",
       "import": "./common/index.ts",
-      "types": "./common/index.ts",
       "default": "./common/index.ts"
     },
-    "./common/*": "./common/*",
+    "./common/*": {
+      "types": "./types/common/*.d.ts",
+      "import": "./common/*",
+      "default": "./common/*"
+    },
+    "./common/*.ts": {
+      "types": "./types/common/*.d.ts",
+      "import": "./common/*.ts",
+      "default": "./common/*.ts"
+    },
+    "./common/*.tsx": {
+      "types": "./types/common/*.d.ts",
+      "import": "./common/*.tsx",
+      "default": "./common/*.tsx"
+    },
     "./fetch": {
+      "types": "./types/fetch/index.d.ts",
       "import": "./fetch/index.ts",
-      "types": "./fetch/index.ts",
       "default": "./fetch/index.ts"
     },
     "./document": {
+      "types": "./types/document/index.d.ts",
       "import": "./document/index.ts",
-      "types": "./document/index.ts",
       "default": "./document/index.ts"
     },
     "./signal": {
+      "types": "./types/signal/index.d.ts",
       "import": "./signal/index.ts",
-      "types": "./signal/index.ts",
       "default": "./signal/index.ts"
     },
     "./store": {
+      "types": "./types/store/index.d.ts",
       "import": "./store/index.ts",
-      "types": "./store/index.ts",
       "default": "./store/index.ts"
     },
     "./ui": {
+      "types": "./types/ui/index.d.ts",
       "import": "./ui/index.ts",
-      "types": "./ui/index.ts",
       "default": "./ui/index.ts"
     },
-    "./ui/*": "./ui/*",
+    "./ui/*": {
+      "types": "./types/ui/*.d.ts",
+      "import": "./ui/*",
+      "default": "./ui/*"
+    },
+    "./ui/*.ts": {
+      "types": "./types/ui/*.d.ts",
+      "import": "./ui/*.ts",
+      "default": "./ui/*.ts"
+    },
+    "./ui/*.tsx": {
+      "types": "./types/ui/*.d.ts",
+      "import": "./ui/*.tsx",
+      "default": "./ui/*.tsx"
+    },
     "./client": {
+      "types": "./types/client/index.d.ts",
       "import": "./client/index.ts",
-      "types": "./client/index.ts",
       "default": "./client/index.ts"
     },
     "./webkit": {
+      "types": "./types/webkit/index.d.ts",
       "import": "./webkit/index.ts",
-      "types": "./webkit/index.ts",
       "default": "./webkit/index.ts"
     },
-    "./webkit/*": "./webkit/*",
+    "./webkit/*": {
+      "types": "./types/webkit/*.d.ts",
+      "import": "./webkit/*",
+      "default": "./webkit/*"
+    },
+    "./webkit/*.ts": {
+      "types": "./types/webkit/*.d.ts",
+      "import": "./webkit/*.ts",
+      "default": "./webkit/*.ts"
+    },
+    "./webkit/*.tsx": {
+      "types": "./types/webkit/*.d.ts",
+      "import": "./webkit/*.tsx",
+      "default": "./webkit/*.tsx"
+    },
     "./server": {
+      "types": "./types/server/index.d.ts",
       "import": "./server/index.ts",
-      "types": "./server/index.ts",
       "default": "./server/index.ts"
     },
     "./service": {
+      "types": "./types/service/index.d.ts",
       "import": "./service/index.ts",
-      "types": "./service/index.ts",
       "default": "./service/index.ts"
     },
     "./constant": {
+      "types": "./types/constant/index.d.ts",
       "import": "./constant/index.ts",
-      "types": "./constant/index.ts",
       "default": "./constant/index.ts"
     },
     "./dictionary": {
+      "types": "./types/dictionary/index.d.ts",
       "import": "./dictionary/index.ts",
-      "types": "./dictionary/index.ts",
       "default": "./dictionary/index.ts"
     },
     "./devkit": {
+      "types": "./types/devkit/index.d.ts",
       "import": "./devkit/index.ts",
-      "types": "./devkit/index.ts",
       "default": "./devkit/index.ts"
     },
     "./test": {
+      "types": "./types/test/index.d.ts",
       "import": "./test/index.ts",
-      "types": "./test/index.ts",
       "default": "./test/index.ts"
     },
     "./cli": {
+      "types": "./types/cli/index.d.ts",
       "import": "./cli/index.ts",
-      "types": "./cli/index.ts",
       "default": "./cli/index.ts"
     },
     "./ui/styles.css": "./ui/styles.css",
     "./server/rsc-worker": {
+      "types": "./types/server/rscWorker.d.ts",
       "import": "./server/rscWorker.tsx",
-      "types": "./server/rscWorker.tsx",
       "default": "./server/rscWorker.tsx"
     }
   },
@@ -197,7 +239,8 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.4.4",
-    "@capacitor/cli": "^8.3.4"
+    "@capacitor/cli": "^8.3.4",
+    "@types/bun": "^1.3.14"
   },
   "bun": {
     "platform": "bun"

package/server/webRouter.ts

@@ -1,7 +1,13 @@
 import fs from "node:fs";
 import path from "node:path";
 import { getEnv } from "akanjs/base";
-import { DEFAULT_AKAN_I18N, getBasePathFromPathname, Logger, parseAkanI18nEnv } from "akanjs/common";
+import {
+  type AkanI18nConfig,
+  DEFAULT_AKAN_I18N,
+  getBasePathFromPathname,
+  Logger,
+  parseAkanI18nEnv,
+} from "akanjs/common";
 import { parseCookieHeader } from "akanjs/fetch";
 import type { AkanMetricsReport } from "akanjs/service";
 import {
@@ -21,6 +27,25 @@ import { createDefaultSitemapXml, getSitemapBasePath } from "./sitemap";
 import { SsrFromRscRenderer } from "./ssrFromRscRenderer";
 import type { BaseBuildArtifact, HttpRoutes, RenderState } from "./types";
 
+const RESERVED_BASE_PATHS = new Set(["admin"]);
+
+export function normalizeRscTargetUrlForHostBasePath(
+  targetUrl: URL,
+  options: { basePath: string | null; i18n: AkanI18nConfig },
+): URL {
+  const { basePath, i18n } = options;
+  if (!basePath) return targetUrl;
+
+  const segments = targetUrl.pathname.split("/").filter(Boolean);
+  const [locale, firstPath] = segments;
+  if (!locale || !i18n.locales.includes(locale)) return targetUrl;
+  if (firstPath === basePath || RESERVED_BASE_PATHS.has(firstPath ?? "")) return targetUrl;
+
+  const normalized = new URL(targetUrl);
+  normalized.pathname = `/${[locale, basePath, ...segments.slice(1)].join("/")}`;
+  return normalized;
+}
+
 export interface SsrRoutesResult {
   renderEnvRoutes: HttpRoutes;
   hmrHub: HmrWsHub | null;
@@ -198,11 +223,19 @@ export class WebRouter {
           /** After TLS/pass-through proxies Bun often sees internal http origins; forwarded headers preserve the browser origin for same-origin checks. */
           const clientOrigin = WebRouter.#clientFacingOrigin(req);
           const target = reqUrl.searchParams.get("url");
-          const targetUrl = target ? new URL(target, clientOrigin) : reqUrl;
+          const rawTargetUrl = target ? new URL(target, clientOrigin) : reqUrl;
+          const basePath =
+            req.headers.get("x-base-path") ?? WebRouter.#basePathForRequestHost(req, this.#artifact.subRoutes);
+          const targetUrl = normalizeRscTargetUrlForHostBasePath(rawTargetUrl, {
+            basePath,
+            i18n: this.#artifact.i18n,
+          });
           if (!WebRouter.#isTrustedRscTarget(clientOrigin, targetUrl))
             return new Response("Bad Request", { status: 400 });
           const manifest = await this.#ensureRoute(targetUrl);
-          const rscReq = new Request(targetUrl, { method: "GET", headers: req.headers });
+          const rscHeaders = new Headers(req.headers);
+          if (basePath) rscHeaders.set("x-base-path", basePath);
+          const rscReq = new Request(targetUrl, { method: "GET", headers: rscHeaders });
           const result = await this.#rsc.renderWithMeta(rscReq, { clientManifest: manifest.clientManifest });
           if (result.type === "redirect") return WebRouter.#rscRedirectResponse(result.location, result.method);
           if (result.type === "not-found") return WebRouter.#rscRedirectResponse("/404", "replace");

package/types/base/base.d.ts

@@ -0,0 +1,53 @@
+import type { Cls } from ".";
+import { Float, Int } from "./primitiveRegistry.d.ts";
+export type EnumInstance<RefName extends string = string, T = string | number> = Cls<{
+    refName: RefName;
+    value: T;
+}, {
+    refName: RefName;
+    type: StringConstructor | typeof Int | typeof Float;
+    values: readonly T[];
+    valueMap: Map<T, number>;
+    has: (value: T) => boolean;
+    indexOf: (value: T) => number;
+    find: (callback: (value: T, index: number, array: readonly T[]) => boolean) => T;
+    findIndex: (callback: (value: T, index: number, array: readonly T[]) => boolean) => number;
+    filter: (callback: (value: T, index: number, array: readonly T[]) => boolean) => T[];
+    map: <R>(callback: (value: T, index: number, array: readonly T[]) => R) => R[];
+    forEach: (callback: (value: T, index: number, array: readonly T[]) => void) => void;
+}>;
+/** Returns true when a class was created by `enumOf`. */
+export declare const isEnum: (enumRef: Cls) => boolean;
+/** Creates a typed scalar enum class from a readonly list of string or number values. */
+export declare const enumOf: <RefName extends string, T = string | number>(refName: RefName, values: readonly T[]) => EnumInstance<RefName, T>;
+/** Id-keyed list helper used for light model collections and immutable-style list updates. */
+export declare class DataList<Light extends {
+    id: string;
+}> {
+    #private;
+    length: number;
+    values: Light[];
+    constructor(data?: Light[] | DataList<Light>);
+    indexOf(id: string): number;
+    set(value: Light): this;
+    delete(id: string): this;
+    get(id: string): Light | undefined;
+    at(idx: number): Light | undefined;
+    pickAt(idx: number): Light;
+    pick(id: string): Light;
+    has(id: string): boolean;
+    find(fn: (value: Light, idx: number) => boolean): Light | undefined;
+    findIndex(fn: (value: Light, idx: number) => boolean): number;
+    some(fn: (value: Light, idx: number) => boolean): boolean;
+    every(fn: (value: Light, idx: number) => boolean): boolean;
+    forEach(fn: (value: Light, idx: number) => void): void;
+    map<T>(fn: (value: Light, idx: number) => T): T[];
+    flatMap<T>(fn: (value: Light, idx: number, array: Light[]) => T | readonly T[]): T[];
+    sort(fn: (a: Light, b: Light) => number): DataList<Light>;
+    filter(fn: (value: Light, idx: number) => boolean): DataList<Light>;
+    reduce<T>(fn: (acc: T, value: Light, idx: number) => T, initialValue: T): T;
+    slice(start: number, end?: number): DataList<Light>;
+    save(): DataList<Light>;
+    [Symbol.iterator](): ArrayIterator<Light>;
+}
+export declare const logo = "\n     _    _                  _     \n    / \\  | | ____ _ _ __    (_)___ \n   / _ \\ | |/ / _' | '_ \\   | / __|\n  / ___ \\|   < (_| | | | |_ | \\__ \\\n /_/   \\_\\_|\\_\\__,_|_| |_(_)/ |___/\n                          |__/      \n? See more details on docs  https://www.akanjs.com/docs\n\u2605 Star Akanjs on GitHub     https://github.com/akan-team/akanjs\n\n";

package/types/base/baseEnv.d.ts

@@ -0,0 +1,68 @@
+export type Environment = "testing" | "debug" | "develop" | "main" | "local";
+export type DatabaseMode = "single" | "multiple" | "cluster";
+export interface BaseEnv {
+    repoName: string;
+    serveDomain: string;
+    appName: string;
+    environment: Environment;
+    operationMode: "local" | "edge" | "cloud" | "module";
+    tunnelUsername: string;
+    tunnelPassword: string;
+    databaseMode?: DatabaseMode;
+}
+export type BackendEnv = BaseEnv & {
+    hostname?: string | null;
+    port?: number;
+    database?: {
+        mode?: DatabaseMode;
+        driver?: "sqlite" | "libsql" | "postgres";
+        sqlite?: {
+            filePath?: string;
+            journalMode?: string;
+            busyTimeoutMs?: number;
+            synchronous?: string;
+            foreignKeys?: boolean;
+            cacheSize?: number;
+            tempStore?: string;
+        };
+        libsql?: {
+            url?: string;
+            authToken?: string;
+        };
+        postgres?: {
+            url?: string;
+            host?: string;
+            port?: number;
+            database?: string;
+            user?: string;
+            password?: string;
+        };
+    };
+    solid?: {
+        filePath?: string;
+        journalMode?: string;
+        busyTimeoutMs?: number;
+        synchronous?: string;
+        cleanupIntervalMs?: number;
+        queuePollIntervalMs?: number;
+        queueLeaseMs?: number;
+    };
+    onCleanup?: () => Promise<void>;
+};
+export type ClientEnv = BaseEnv & {
+    side: "server" | "client";
+    renderMode: "ssr" | "csr";
+    websocket: boolean;
+    clientHost: string;
+    clientPort: number;
+    clientHttpProtocol: "http:" | "https:";
+    clientHttpUri: string;
+    serverHost: string;
+    serverPort: number;
+    serverHttpProtocol: "http:" | "https:";
+    serverHttpUri: string;
+    serverWsProtocol: "ws:" | "wss:";
+    serverWsUri: string;
+};
+/** Reads and caches Akan runtime environment values from process/browser environment settings. */
+export declare const getEnv: () => ClientEnv;

package/types/base/index.d.ts

@@ -0,0 +1,6 @@
+export * from "./base.d.ts";
+export * from "./baseEnv.d.ts";
+export * from "./primitiveRegistry.d.ts";
+export * from "./symbols.d.ts";
+export * from "./types.d.ts";
+export * from "./utils.d.ts";