@highbeek/create-rnstarterkit 1.0.2-beta.3 → 1.0.2-beta.4

package/dist/src/generators/appGenerator.js

@@ -15,7 +15,7 @@ async function generateApp(options) {
     const targetPath = path_1.default.join(process.cwd(), projectName);
     console.log("📂 Creating project...");
     await fs_extra_1.default.copy(templatePath, targetPath, {
-        filter: (src) => shouldCopyPath(src),
+        filter: (src) => shouldCopyPath(src, templatePath),
     });
     await replaceProjectName(targetPath, projectName);
     await createStandardStructure(targetPath);
@@ -198,6 +198,7 @@ export const queryClient = new QueryClient();
 }
 async function configureApiClientTransport(targetPath, apiClient, apiClientType) {
     if (apiClient && apiClientType === "Axios") {
+        const templateRoot = await resolveTemplateRoot();
         await ensureDependencies(targetPath, {
             dependencies: {
                 axios: "^1.12.2",
@@ -211,88 +212,9 @@ export const axiosClient = axios.create({
   timeout: 15000,
 });
 `);
-        await fs_extra_1.default.writeFile(path_1.default.join(targetPath, "api/client.ts"), `import axios from "axios";
-import { API_BASE_URL } from "../config/env";
-
-export class ApiError extends Error {
-  status: number;
-  data: unknown;
-
-  constructor(status: number, message: string, data: unknown) {
-    super(message);
-    this.name = "ApiError";
-    this.status = status;
-    this.data = data;
-  }
-}
-
-type RequestOptions = {
-  headers?: Record<string, string>;
-  query?: Record<string, string | number | boolean | undefined>;
-  token?: string | null;
-  signal?: AbortSignal;
-};
-
-const client = axios.create({
-  baseURL: API_BASE_URL,
-  timeout: 15000,
-});
-
-function resolveErrorMessage(data: unknown, status: number) {
-  if (
-    typeof data === "object" &&
-    data !== null &&
-    "message" in data &&
-    typeof (data as { message: unknown }).message === "string"
-  ) {
-    return (data as { message: string }).message;
-  }
-  return \`Request failed with status \${status}\`;
-}
-
-async function request<T>(
-  method: "GET" | "POST" | "PUT" | "PATCH" | "DELETE",
-  path: string,
-  body?: unknown,
-  options: RequestOptions = {},
-): Promise<T> {
-  const { headers = {}, query, token, signal } = options;
-  try {
-    const response = await client.request<T>({
-      method,
-      url: path,
-      data: body,
-      params: query,
-      signal,
-      headers: {
-        ...(token ? { Authorization: \`Bearer \${token}\` } : {}),
-        ...headers,
-      },
-    });
-    return response.data;
-  } catch (error) {
-    if (axios.isAxiosError(error)) {
-      const status = error.response?.status ?? 500;
-      const data = error.response?.data ?? null;
-      throw new ApiError(status, resolveErrorMessage(data, status), data);
-    }
-    throw error;
-  }
-}
-
-export const apiClient = {
-  get: <T>(path: string, options?: RequestOptions) =>
-    request<T>("GET", path, undefined, options),
-  post: <T>(path: string, body?: unknown, options?: RequestOptions) =>
-    request<T>("POST", path, body, options),
-  put: <T>(path: string, body?: unknown, options?: RequestOptions) =>
-    request<T>("PUT", path, body, options),
-  patch: <T>(path: string, body?: unknown, options?: RequestOptions) =>
-    request<T>("PATCH", path, body, options),
-  delete: <T>(path: string, options?: RequestOptions) =>
-    request<T>("DELETE", path, undefined, options),
-};
-`, "utf8");
+        await fs_extra_1.default.copy(path_1.default.join(templateRoot, "optional/apiClient/api/client.axios.ts"), path_1.default.join(targetPath, "api/client.ts"), {
+            overwrite: true,
+        });
     }
 }
 async function configureValidation(targetPath, validation) {
@@ -386,18 +308,20 @@ async function resolveTemplateRoot() {
     }
     throw new Error("Template root not found.");
 }
-function shouldCopyPath(src) {
-    const normalized = src.replace(/\\/g, "/");
+function shouldCopyPath(src, templatePath) {
+    const relative = path_1.default.relative(templatePath, src).replace(/\\/g, "/");
+    if (!relative || relative === ".")
+        return true;
     const blockedSegments = [
-        "/.git/",
-        "/node_modules/",
-        "/ios/Pods/",
-        "/android/.gradle/",
-        "/vendor/bundle/",
+        ".git",
+        "node_modules",
+        "ios/Pods",
+        "android/.gradle",
+        "vendor/bundle",
     ];
-    if (normalized.endsWith("/.git"))
-        return false;
-    return !blockedSegments.some((segment) => normalized.includes(segment));
+    return !blockedSegments.some((segment) => relative === segment ||
+        relative.startsWith(`${segment}/`) ||
+        relative.includes(`/${segment}/`));
 }
 function isTextFile(filePath) {
     const extension = path_1.default.extname(filePath).toLowerCase();

package/dist/templates/optional/apiClient/api/client.axios.ts

@@ -0,0 +1,124 @@
+import axios, {
+  AxiosError,
+  AxiosRequestConfig,
+  AxiosResponse,
+  InternalAxiosRequestConfig,
+} from "axios";
+import { API_BASE_URL } from "../config/env";
+
+export class ApiError extends Error {
+  status: number;
+  data: unknown;
+
+  constructor(status: number, message: string, data: unknown) {
+    super(message);
+    this.name = "ApiError";
+    this.status = status;
+    this.data = data;
+  }
+}
+
+type RequestOptions = {
+  headers?: Record<string, string>;
+  query?: Record<string, string | number | boolean | undefined>;
+  token?: string | null;
+  signal?: AbortSignal;
+};
+
+const client = axios.create({
+  baseURL: API_BASE_URL,
+  timeout: 15000,
+});
+
+let authTokenGetter: (() => string | null | undefined) | null = null;
+
+export function setAuthTokenGetter(getter: (() => string | null | undefined) | null) {
+  authTokenGetter = getter;
+}
+
+function resolveErrorMessage(data: unknown, status: number) {
+  if (
+    typeof data === "object" &&
+    data !== null &&
+    "message" in data &&
+    typeof (data as { message: unknown }).message === "string"
+  ) {
+    return (data as { message: string }).message;
+  }
+  return `Request failed with status ${status}`;
+}
+
+export function addRequestInterceptor(
+  interceptor: (
+    config: InternalAxiosRequestConfig,
+  ) =>
+    | InternalAxiosRequestConfig
+    | Promise<InternalAxiosRequestConfig>,
+) {
+  return client.interceptors.request.use(interceptor);
+}
+
+export function addResponseInterceptor(
+  onFulfilled?: (
+    response: AxiosResponse,
+  ) => AxiosResponse | Promise<AxiosResponse>,
+  onRejected?: (error: AxiosError) => unknown,
+) {
+  return client.interceptors.response.use(onFulfilled, onRejected);
+}
+
+// Default auth + error interceptors.
+addRequestInterceptor((config) => {
+  const token = authTokenGetter?.();
+  if (token) {
+    config.headers.Authorization = `Bearer ${token}`;
+  }
+  return config;
+});
+
+addResponseInterceptor(
+  (response) => response,
+  (error) => {
+    if (axios.isAxiosError(error)) {
+      const status = error.response?.status ?? 500;
+      const data = error.response?.data ?? null;
+      return Promise.reject(new ApiError(status, resolveErrorMessage(data, status), data));
+    }
+    return Promise.reject(error);
+  },
+);
+
+async function request<T>(
+  method: "GET" | "POST" | "PUT" | "PATCH" | "DELETE",
+  path: string,
+  body?: unknown,
+  options: RequestOptions = {},
+): Promise<T> {
+  const { headers = {}, query, token, signal } = options;
+  const requestConfig: AxiosRequestConfig = {
+    method,
+    url: path,
+    data: body,
+    params: query,
+    signal,
+    headers: {
+      ...(token ? { Authorization: `Bearer ${token}` } : {}),
+      ...headers,
+    },
+  };
+  const response = await client.request<T>(requestConfig);
+  return response.data;
+}
+
+export const apiClient = {
+  get: <T>(path: string, options?: RequestOptions) =>
+    request<T>("GET", path, undefined, options),
+  post: <T>(path: string, body?: unknown, options?: RequestOptions) =>
+    request<T>("POST", path, body, options),
+  put: <T>(path: string, body?: unknown, options?: RequestOptions) =>
+    request<T>("PUT", path, body, options),
+  patch: <T>(path: string, body?: unknown, options?: RequestOptions) =>
+    request<T>("PATCH", path, body, options),
+  delete: <T>(path: string, options?: RequestOptions) =>
+    request<T>("DELETE", path, undefined, options),
+};

package/dist/templates/optional/apiClient/api/client.ts

@@ -20,6 +20,41 @@ type RequestOptions = {
   signal?: AbortSignal;
 };
 
+type RequestInterceptor = (
+  input: {
+    method: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+    path: string;
+    options: RequestOptions;
+  },
+) =>
+  | {
+      method: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+      path: string;
+      options: RequestOptions;
+    }
+  | Promise<{
+      method: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+      path: string;
+      options: RequestOptions;
+    }>;
+type ResponseInterceptor = (response: Response) => Response | Promise<Response>;
+
+let authTokenGetter: (() => string | null | undefined) | null = null;
+const requestInterceptors: RequestInterceptor[] = [];
+const responseInterceptors: ResponseInterceptor[] = [];
+
+export function setAuthTokenGetter(getter: (() => string | null | undefined) | null) {
+  authTokenGetter = getter;
+}
+
+export function addRequestInterceptor(interceptor: RequestInterceptor) {
+  requestInterceptors.push(interceptor);
+}
+
+export function addResponseInterceptor(interceptor: ResponseInterceptor) {
+  responseInterceptors.push(interceptor);
+}
+
 function buildUrl(path: string, query?: RequestOptions["query"]) {
   const normalizedPath = path.startsWith("/") ? path : `/${path}`;
   const url = new URL(`${API_BASE_URL}${normalizedPath}`);
@@ -56,10 +91,15 @@ async function request<T>(
   path: string,
   options: RequestOptions = {},
 ): Promise<T> {
-  const { headers = {}, query, body, token, signal } = options;
+  let requestInput = { method, path, options };
+  for (const interceptor of requestInterceptors) {
+    requestInput = await interceptor(requestInput);
+  }
 
-  const response = await fetch(buildUrl(path, query), {
-    method,
+  const { headers = {}, query, body, token, signal } = requestInput.options;
+
+  let response = await fetch(buildUrl(requestInput.path, query), {
+    method: requestInput.method,
     headers: {
       "Content-Type": "application/json",
       ...(token ? { Authorization: `Bearer ${token}` } : {}),
@@ -69,6 +109,10 @@ async function request<T>(
     signal,
   });
 
+  for (const interceptor of responseInterceptors) {
+    response = await interceptor(response);
+  }
+
   return parseResponse<T>(response);
 }
 
@@ -84,3 +128,15 @@ export const apiClient = {
   delete: <T>(path: string, options?: Omit<RequestOptions, "body">) =>
     request<T>("DELETE", path, options),
 };
+
+// Default interceptor setup: attach bearer token if configured.
+addRequestInterceptor((input) => {
+  const token = input.options.token ?? authTokenGetter?.() ?? null;
+  return {
+    ...input,
+    options: {
+      ...input.options,
+      token,
+    },
+  };
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highbeek/create-rnstarterkit",
-  "version": "1.0.2-beta.3",
+  "version": "1.0.2-beta.4",
   "description": "CLI to scaffold production-ready React Native app structures.",
   "main": "dist/src/generators/appGenerator.js",
   "bin": {