@qlover/create-app 0.1.10 → 0.1.12

package/templates/react-app/src/uikit/utils/RequestLogger.ts

@@ -1,16 +1,19 @@
+import { IOCIdentifier } from '@/base/consts/IOCIdentifier';
 import {
   ExecutorPlugin,
   ExecutorContext,
   RequestAdapterFetchConfig,
   Logger
 } from '@qlover/fe-utils';
+import { injectable, inject } from 'inversify';
 
+@injectable()
 export class RequestLogger
   implements ExecutorPlugin<RequestAdapterFetchConfig>
 {
   readonly pluginName = 'RequestLogger';
 
-  constructor(public logger: Logger) {}
+  constructor(@inject(IOCIdentifier.Logger) public logger: Logger) {}
 
   async onSuccess({
     parameters,

package/templates/react-app/tsconfig.json

@@ -22,7 +22,8 @@
       "@/*": ["./src/*"],
       "@lib/*": ["./lib/*"],
       "@config/*": ["./config/*"]
-    }
+    },
+    "experimentalDecorators": true
   },
   "include": ["src"],
   "references": [{ "path": "./tsconfig.node.json" }]

package/templates/react-app/tsconfig.node.json

@@ -4,7 +4,11 @@
     "skipLibCheck": true,
     "module": "ESNext",
     "moduleResolution": "bundler",
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
+    "paths": {
+      "@lib/*": ["./lib/*"],
+      "@config/*": ["./config/*"]
+    }
   },
-  "include": ["vite.config.ts"]
+  "include": ["vite.config.ts", "lib", "config"]
 }

package/templates/react-app/vite.config.ts

@@ -4,11 +4,23 @@ import alias from '@rollup/plugin-alias';
 import tsappconfig from './tsconfig.json';
 import { resolve } from 'path';
 import { Env } from '@qlover/env-loader';
+import { envPrefix } from './config/common';
+import { name, version } from './package.json';
+import { injectPkgConfig } from './lib/env-config/injectPkgConfig';
 
 Env.searchEnv();
 
 const tsAppPaths = tsappconfig.compilerOptions.paths || {};
 
+// add version and name to env
+injectPkgConfig(
+  [
+    ['APP_NAME', name],
+    ['APP_VERSION', version]
+  ],
+  envPrefix
+);
+
 // convert tsconfig paths to vite alias
 const entries = Object.entries(tsAppPaths).reduce((acc, [key, value]) => {
   acc[key.replace('/*', '')] = resolve(__dirname, value[0].replace('/*', ''));
@@ -23,10 +35,12 @@ export default defineConfig({
       entries
     })
   ],
+  envPrefix: envPrefix,
   publicDir: 'public',
   server: {
     port: Number(process.env.VITE_SERVER_PORT || 3200)
   },
+  mode: process.env.NODE_ENV,
   test: {
     environment: 'jsdom',
     globals: true,

package/templates/react-app/config/app.common.ts

@@ -1,52 +0,0 @@
-import { i18nConfig } from '@config/i18n';
-import { OpenAIClientConfig } from '@lib/openAiApi';
-import { RequestCommonPluginConfig } from '@lib/request-common-plugin';
-import { RequestAdapterFetchConfig } from '@qlover/fe-utils';
-
-export const openAiModels = [
-  'gpt-3.5-turbo',
-  'gpt-3.5-turbo-2',
-  'gpt-4',
-  'gpt-4-32k'
-];
-
-export const requestCommonPluginConfig: RequestCommonPluginConfig = {
-  tokenPrefix: 'Bearer',
-  defaultHeaders: {
-    'Content-Type': 'application/json'
-  },
-  defaultRequestData: {
-    model: 'gpt-4o-mini',
-    stream: true
-  },
-  requiredToken: true,
-  token: import.meta.env.VITE_OPENAI_API_KEY
-};
-
-export const openAiConfig: OpenAIClientConfig = {
-  baseURL: import.meta.env.VITE_OPENAI_API_URL,
-  models: openAiModels,
-  commonPluginConfig: requestCommonPluginConfig
-};
-
-export const defaultBaseRoutemeta = {
-  localNamespace: i18nConfig.defaultNS,
-  title: '',
-  icon: ''
-} as const;
-
-export const defaultLoginInfo = {
-  name: 'qlover',
-  password: 'q1234566'
-};
-
-export const defaultFeApiConfig: {
-  adapter: Partial<RequestAdapterFetchConfig>;
-  commonPluginConfig: RequestCommonPluginConfig;
-} = {
-  adapter: {
-    responseType: 'json',
-    baseURL: 'https://api.example.com/'
-  },
-  commonPluginConfig: requestCommonPluginConfig
-};

package/templates/react-app/src/base/port/IOCInterface.ts

@@ -1,53 +0,0 @@
-export interface Abstract<T> {
-  prototype: T;
-}
-export type Newable<T, Args extends unknown[] = unknown[]> = new (
-  ...args: Args
-) => T;
-
-export type ServiceIdentifier<T = unknown> =
-  | string
-  | symbol
-  | Newable<T>
-  | Abstract<T>;
-
-/**
- * IOC container
- *
- */
-export interface IOCInterface {
-  /**
-   * configure IOC container
-   */
-  configure(): void;
-
-  /**
-   * bind instance
-   *
-   * @param serviceIdentifier
-   * @param value
-   */
-  bind<T>(serviceIdentifier: ServiceIdentifier<T>, value: T): void;
-
-  /**
-   * get instance
-   *
-   * @param serviceIdentifier
-   * @returns
-   */
-  get<T>(serviceIdentifier: ServiceIdentifier<T>): T;
-
-  /**
-   * You can also use the override method to specify a replacement at runtime
-   *
-   * However, it may have performance issues because it creates an additional instance
-   *
-   * @param serviceIdentifier
-   * @param value
-   */
-  override<T>(serviceIdentifier: ServiceIdentifier<T>, value: T): void;
-}
-
-export interface IOCRegisterInterface {
-  register(container: IOCInterface): void;
-}

package/templates/react-app/src/core/feIOC/FeIOC.ts

@@ -1,32 +0,0 @@
-import { IOCInterface } from '@/base/port/IOCInterface';
-import { RegisterApi } from './RegisterApi';
-import { RegisterControllers } from './RegisterControllers';
-import { RegisterCommon } from './RegisterCommon';
-
-export class FeIOC implements IOCInterface {
-  private container: Map<string, unknown> = new Map();
-
-  /**
-   * order:
-   * 1. RegisterCommon
-   * 2. RegisterApi
-   * 3. RegisterControllers
-   */
-  configure(): void {
-    new RegisterCommon().register(this);
-    new RegisterApi().register(this);
-    new RegisterControllers().register(this);
-  }
-
-  bind<T>(key: string, value: T): void {
-    this.container.set(key, value);
-  }
-
-  get<T>(key: string): T {
-    return this.container.get(key) as T;
-  }
-
-  override<T>(key: string, value: T): void {
-    this.bind(key, value);
-  }
-}

package/templates/react-app/src/core/feIOC/RegisterApi.ts

@@ -1,41 +0,0 @@
-import { IOCInterface, IOCRegisterInterface } from '@/base/port/IOCInterface';
-import { RequestLogger } from '@/uikit/utils/RequestLogger';
-import { localJsonStorage } from '../globals';
-import { FetchAbortPlugin, FetchURLPlugin } from '@qlover/fe-utils';
-import { FeApiMockPlugin } from '@/base/apis/feApi';
-import { defaultFeApiConfig } from '@config/app.common';
-import { OpenAIClient } from '@lib/openAiApi';
-import { openAiConfig } from '@config/app.common';
-import { FeApi } from '@/base/apis/feApi';
-import { RequestCommonPlugin } from '@lib/request-common-plugin';
-import mockDataJson from '@config/feapi.mock.json';
-
-export class RegisterApi implements IOCRegisterInterface {
-  register(container: IOCInterface): void {
-    const openAiApi = new OpenAIClient({
-      ...openAiConfig,
-      commonPluginConfig: {
-        ...openAiConfig.commonPluginConfig,
-        requestDataSerializer: (data) => JSON.stringify(data)
-      }
-    }).usePlugin(container.get(RequestLogger));
-
-    const feApi = new FeApi({
-      abortPlugin: container.get(FetchAbortPlugin),
-      config: defaultFeApiConfig.adapter
-    })
-      .usePlugin(new FetchURLPlugin())
-      .usePlugin(
-        new RequestCommonPlugin({
-          ...defaultFeApiConfig.commonPluginConfig,
-          token: () => localJsonStorage.getItem('fe_user_token')
-        })
-      )
-      .usePlugin(new FeApiMockPlugin(mockDataJson))
-      .usePlugin(container.get(RequestLogger))
-      .usePlugin(container.get(FetchAbortPlugin));
-
-    container.bind(OpenAIClient, openAiApi);
-    container.bind(FeApi, feApi);
-  }
-}

package/templates/react-app/src/core/feIOC/RegisterCommon.ts

@@ -1,20 +0,0 @@
-import { IOCInterface, IOCRegisterInterface } from '@/base/port/IOCInterface';
-import { RequestLogger } from '@/uikit/utils/RequestLogger';
-import { localJsonStorage, logger } from '../globals';
-import { FetchAbortPlugin } from '@qlover/fe-utils';
-import { UserToken } from '@/base/cases/UserToken';
-
-export class RegisterCommon implements IOCRegisterInterface {
-  register(container: IOCInterface): void {
-    const requestLogger = new RequestLogger(logger);
-    const feApiAbort = new FetchAbortPlugin();
-    const userToken = new UserToken({
-      storageKey: 'fe_user_token',
-      storage: localJsonStorage
-    });
-
-    container.bind(RequestLogger, requestLogger);
-    container.bind(FetchAbortPlugin, feApiAbort);
-    container.bind(UserToken, userToken);
-  }
-}

package/templates/react-app/src/core/index.ts

@@ -1,31 +0,0 @@
-// ! dont't import tsx, only ts file
-import { ServiceIdentifier, IOCInterface } from '@/base/port/IOCInterface';
-
-export type IOCFunction = {
-  <T>(serviceIdentifier: ServiceIdentifier<T>): T;
-  /**
-   * IOC container instance
-   */
-  implemention: IOCInterface | null;
-  /**
-   * implement IOC container
-   */
-  implement(container: IOCInterface): void;
-};
-
-export const IOC: IOCFunction = Object.assign(
-  function <T>(serviceIdentifier: ServiceIdentifier<T>): T {
-    if (!IOC.implemention) {
-      throw new Error('IOC is not implemented');
-    }
-    return IOC.implemention.get(serviceIdentifier);
-  },
-  {
-    implemention: null,
-    implement: (container: IOCInterface) => {
-      // FIXME: maybe runtimes configure
-      container.configure();
-      IOC.implemention = container;
-    }
-  }
-);

package/templates/react-app/src/pages/index.tsx

@@ -1,113 +0,0 @@
-import { lazy, Suspense } from 'react';
-import isString from 'lodash/isString';
-import {
-  LoadProps,
-  PagesMaps,
-  RouteCategory,
-  RouteType
-} from '@/base/types/Page';
-import { Loading } from '@/components/Loading';
-import BaseRouteProvider from '../uikit/providers/BaseRouteProvider';
-import NotFound from './404';
-import NotFound500 from './500';
-
-const staticComponentsMaps: Record<string, () => React.ComponentType<unknown>> =
-  {
-    '404': () => NotFound as React.ComponentType<unknown>,
-    '500': () => NotFound500 as React.ComponentType<unknown>
-  };
-
-const getRealComponents = () => {
-  return import.meta.glob('./*/**/*.tsx');
-};
-
-const getLazyComponentMaps = () => {
-  const modules = getRealComponents();
-
-  const pagesMaps: PagesMaps = {};
-
-  for (const path in modules) {
-    const componentName = path.replace(/^\.\/(.*)\.tsx$/, '$1');
-
-    pagesMaps[componentName] = () =>
-      lazy(
-        modules[path] as () => Promise<{
-          default: React.ComponentType<unknown>;
-        }>
-      );
-  }
-
-  return pagesMaps;
-};
-
-// 懒加载组件
-const lazyLoad = ({ pagesMaps, componentPath, route, Provider }: LoadProps) => {
-  // first try static
-  let loadedComponent = staticComponentsMaps[componentPath];
-  if (!loadedComponent) {
-    loadedComponent = pagesMaps[componentPath];
-  }
-
-  if (!loadedComponent) {
-    console.warn(`Route ${componentPath} not found`);
-    return <NotFound route={componentPath} />;
-  }
-
-  const Component = loadedComponent();
-
-  return (
-    <Suspense fallback={<Loading fullscreen />}>
-      {Provider ? (
-        <Provider {...route.meta}>
-          <Component />
-        </Provider>
-      ) : (
-        <Component />
-      )}
-    </Suspense>
-  );
-};
-
-// 转换单个路由
-const transformRoute = (
-  route: RouteType,
-  options: Pick<LoadProps, 'pagesMaps' | 'Provider'>
-): RouteType => {
-  const result: RouteType = {
-    ...route,
-    path: route.path
-  };
-
-  if (isString(route.element)) {
-    result.element = lazyLoad({
-      ...options,
-      componentPath: route.element,
-      route
-    });
-  }
-
-  if (route.children) {
-    result.children = route.children.map((child) =>
-      transformRoute(child, options)
-    );
-  }
-
-  return result;
-};
-
-export function createFeReactRoutes(routes: RouteType[]) {
-  const pagesMaps = getLazyComponentMaps();
-
-  return routes.map((route) =>
-    transformRoute(route, { pagesMaps, Provider: BaseRouteProvider })
-  );
-}
-
-export function filterRoutesByCategory(
-  routes: RouteType[],
-  category: RouteCategory[]
-): RouteType[] {
-  return routes.filter((route) =>
-    route.meta?.category ? category.includes(route.meta?.category) : true
-  );
-}