@umijs/plugins 4.0.0-rc.9 → 4.0.2

package/dist/request.js

@@ -7,7 +7,12 @@ exports.default = (api) => {
         key: 'request',
         config: {
             schema: (joi) => {
-                return joi.object();
+                return joi.object({
+                    dataField: joi
+                        .string()
+                        .pattern(/^[a-zA-Z]*$/)
+                        .allow(''),
+                });
             },
         },
         enableBy: api.EnableBy.config,
@@ -20,7 +25,6 @@ import axios, {
   type AxiosResponse,
 } from '{{{axiosPath}}}';
 import useUmiRequest, { UseRequestProvider } from '{{{umiRequestPath}}}';
-import { message, notification } from '{{{antdPkg}}}';
 import { ApplyPluginsType } from 'umi';
 import { getPluginManager } from '../core/plugin';
 
@@ -81,7 +85,7 @@ function useRequest<Item = any, U extends Item = any>(
 ): PaginatedResult<Item>;
 function useRequest(service: any, options: any = {}) {
   return useUmiRequest(service, {
-    formatResult: result => result?.data,
+    formatResult: {{{formatResult}}},
     requestMethod: (requestOptions: any) => {
       if (typeof requestOptions === 'string') {
         return request(requestOptions);
@@ -96,114 +100,49 @@ function useRequest(service: any, options: any = {}) {
   });
 }
 
-export interface RequestConfig extends AxiosRequestConfig {
-  errorConfig?: {
-    errorPage?: string;
-    adaptor?: IAdaptor; // adaptor 用以用户将不满足接口的后端数据修改成 errorInfo
-    errorHandler?: IErrorHandler;
-    defaultNoneResponseErrorMessage?: string;
-    defaultRequestErrorMessage?: string;
-  };
-  formatResultAdaptor?: IFormatResultAdaptor;
-}
-
-export enum ErrorShowType {
-  SILENT = 0,
-  WARN_MESSAGE = 1,
-  ERROR_MESSAGE = 2,
-  NOTIFICATION = 3,
-  REDIRECT = 9,
-}
-
-export interface IErrorInfo {
-  success: boolean;
-  data?: any;
-  errorCode?: string;
-  errorMessage?: string;
-  showType?: ErrorShowType;
-  traceId?: string;
-  host?: string;
+// request 方法 opts 参数的接口
+interface IRequestOptions extends AxiosRequestConfig {
+  skipErrorHandler?: boolean;
+  requestInterceptors?: IRequestInterceptorTuple[];
+  responseInterceptors?: IResponseInterceptorTuple[];
   [key: string]: any;
 }
-// resData 其实就是 response.data, response 则是 axios 的响应对象
-interface IAdaptor {
-  (resData: any, response: AxiosResponse): IErrorInfo;
+
+interface IRequestOptionsWithResponse extends IRequestOptions {
+  getResponse: true;
 }
 
-export interface RequestError extends Error {
-  data?: any;
-  info?: IErrorInfo;
+interface IRequestOptionsWithoutResponse extends IRequestOptions{
+  getResponse: false;
 }
 
-interface IRequest {
-  (
-    url: string,
-    opts: AxiosRequestConfig & { skipErrorHandler?: boolean },
-  ): Promise<AxiosResponse<any, any>>;
+interface IRequest{
+   <T = any>(url: string, opts: IRequestOptionsWithResponse): Promise<AxiosResponse<T>>;
+   <T = any>(url: string, opts: IRequestOptionsWithoutResponse): Promise<T>;
+   <T = any>(url: string, opts: IRequestOptions): Promise<T>; // getResponse 默认是 false， 因此不提供该参数时，只返回 data
+   <T = any>(url: string): Promise<T>;  // 不提供 opts 时，默认使用 'GET' method，并且默认返回 data
 }
 
 interface IErrorHandler {
-  (error: RequestError, opts: AxiosRequestConfig & { skipErrorHandler?: boolean }, config: RequestConfig): void;
+  (error: RequestError, opts: IRequestOptions): void;
 }
+type IRequestInterceptorAxios = (config: RequestOptions) => RequestOptions;
+type IRequestInterceptorUmiRequest = (url: string, config : RequestOptions) => { url: string, options: RequestOptions };
+type IRequestInterceptor = IRequestInterceptorAxios;
+type IErrorInterceptor = (error: Error) => Promise<Error>;
+type IResponseInterceptor = <T = any>(response : AxiosResponse<T>) => AxiosResponse<T> ;
+type IRequestInterceptorTuple = [IRequestInterceptor , IErrorInterceptor] | [ IRequestInterceptor ] | IRequestInterceptor
+type IResponseInterceptorTuple = [IResponseInterceptor, IErrorInterceptor] | [IResponseInterceptor] | IResponseInterceptor
 
-interface IFormatResultAdaptor {
-  (res: AxiosResponse): any;
+export interface RequestConfig extends AxiosRequestConfig {
+  errorConfig?: {
+    errorHandler?: IErrorHandler;
+    errorThrower?: <T = any>( res: T ) => void
+  };
+  requestInterceptors?: IRequestInterceptorTuple[];
+  responseInterceptors?: IResponseInterceptorTuple[];
 }
 
-const defaultErrorHandler: IErrorHandler = (error, opts, config) => {
-  if (opts?.skipErrorHandler) throw error;
-  const { errorConfig } = config;
-  if (error.response) {
-    // 请求成功发出且服务器也响应了状态码，但状态代码超出了 2xx 的范围 或者 成功响应，success字段为false 由我们抛出的错误
-    let errorInfo: IErrorInfo | undefined;
-    // 不是我们的错误
-    if(error.name === 'ResponseError'){
-      const adaptor: IAdaptor =
-      errorConfig?.adaptor || ((errorData) => errorData);
-      errorInfo = adaptor(error.response.data, error.response);
-      error.info = errorInfo;
-      error.data = error.response.data;
-    }
-    errorInfo = error.info;
-    if (errorInfo) {
-      const { errorMessage, errorCode } = errorInfo;
-      switch (errorInfo.showType) {
-        case ErrorShowType.SILENT:
-          // do nothong
-          break;
-        case ErrorShowType.WARN_MESSAGE:
-          message.warn(errorMessage);
-          break;
-        case ErrorShowType.ERROR_MESSAGE:
-          message.error(errorMessage);
-          break;
-        case ErrorShowType.NOTIFICATION:
-          notification.open({ description: errorMessage, message: errorCode });
-          break;
-        case ErrorShowType.REDIRECT:
-          // TODO: redirect
-          break;
-        default:
-          message.error(errorMessage);
-      }
-    }
-  } else if (error.request) {
-    // 请求已经成功发起，但没有收到响应
-    // \`error.request\` 在浏览器中是 XMLHttpRequest 的实例，
-    // 而在node.js中是 http.ClientRequest 的实例
-    message.error(
-      errorConfig?.defaultNoneResponseErrorMessage ||
-        'None response! Please retry.',
-    );
-  } else {
-    // 发送请求时出了点问题
-    message.error(
-      errorConfig?.defaultRequestErrorMessage || 'Request error, please retry.',
-    );
-  }
-  throw error;
-};
-
 let requestInstance: AxiosInstance;
 let config: RequestConfig;
 const getConfig = (): RequestConfig => {
@@ -215,51 +154,112 @@ const getConfig = (): RequestConfig => {
   });
   return config;
 };
+
 const getRequestInstance = (): AxiosInstance => {
   if (requestInstance) return requestInstance;
   const config = getConfig();
   requestInstance = axios.create(config);
 
+  config?.requestInterceptors?.forEach((interceptor) => {
+    if(interceptor instanceof Array){
+      requestInstance.interceptors.request.use((config) => {
+        const { url } = config;
+        if(interceptor[0].length === 2){
+          const { url: newUrl, options } = interceptor[0](url, config);
+          return { ...options, url: newUrl };
+        }
+        return interceptor[0](config);
+      }, interceptor[1]);
+    } else {
+      requestInstance.interceptors.request.use((config) => {
+        const { url } = config;
+        if(interceptor.length === 2){
+          const { url: newUrl, options } = interceptor(url, config);
+          return { ...options, url: newUrl };
+        }
+        return interceptor(config);
+      })
+    }
+  });
+
+  config?.responseInterceptors?.forEach((interceptor) => {
+    interceptor instanceof Array ?
+      requestInstance.interceptors.response.use(interceptor[0], interceptor[1]):
+       requestInstance.interceptors.response.use(interceptor);
+  });
+
   // 当响应的数据 success 是 false 的时候，抛出 error 以供 errorHandler 处理。
-  requestInstance.interceptors.response.use((response)=>{
-    const {data} = response;
-    const adaptor = config?.errorConfig?.adaptor || ((resData) => resData);
-    const errorInfo = adaptor(data,response);
-    if(errorInfo.success === false){
-      const error: RequestError = new Error(errorInfo.errorMessage);
-      error.name = 'BizError';
-      error.data = data;
-      error.info = errorInfo;
-      error.response = response;
-      throw error;
+  requestInstance.interceptors.response.use((response) => {
+    const { data } = response;
+    if(data?.success === false && config?.errorConfig?.errorThrower){
+      config.errorConfig.errorThrower(data);
     }
     return response;
   })
   return requestInstance;
 };
 
-const request: IRequest = (url, opts) => {
+const request: IRequest = (url: string, opts: any = { method: 'GET' }) => {
   const requestInstance = getRequestInstance();
   const config = getConfig();
-  return new Promise((resolve, reject) => {
+  const { getResponse = false, requestInterceptors, responseInterceptors } = opts;
+  const requestInterceptorsToEject = requestInterceptors?.map((interceptor) => {
+    if(interceptor instanceof Array){
+      return requestInstance.interceptors.request.use((config) => {
+        const { url } = config;
+        if(interceptor[0].length === 2){
+          const { url: newUrl, options } = interceptor[0](url, config);
+          return { ...options, url: newUrl };
+        }
+        return interceptor[0](config);
+      }, interceptor[1]);
+    } else {
+      return requestInstance.interceptors.request.use((config) => {
+        const { url } = config;
+        if(interceptor.length === 2){
+          const { url: newUrl, options } = interceptor(url, config);
+          return { ...options, url: newUrl };
+        }
+        return interceptor(config);
+      })
+    }
+    });
+  const responseInterceptorsToEject = responseInterceptors?.map((interceptor) => {
+    return interceptor instanceof Array ?
+      requestInstance.interceptors.response.use(interceptor[0], interceptor[1]):
+       requestInstance.interceptors.response.use(interceptor);
+    });
+  return new Promise((resolve, reject)=>{
     requestInstance
-      .request({ ...opts, url })
-      .then((res) => {
-        const formatResultAdaptor =
-          config?.formatResultAdaptor || ((res) => res.data);
-        resolve(formatResultAdaptor(res));
+      .request({...opts, url})
+      .then((res)=>{
+        requestInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.request.eject(interceptor);
+        });
+        responseInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.response.eject(interceptor);
+        });
+        resolve(getResponse ? res : res.data);
       })
-      .catch((error) => {
+      .catch((error)=>{
+        requestInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.request.eject(interceptor);
+        });
+        responseInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.response.eject(interceptor);
+        });
         try {
           const handler =
-            config.errorConfig?.errorHandler || defaultErrorHandler;
-          handler(error, opts, config);
+            config?.errorConfig?.errorHandler;
+          if(handler)
+            handler(error, opts, config);
         } catch (e) {
           reject(e);
         }
-      });
-  });
-};
+        reject(error);
+      })
+  })
+}
 
 export {
   useRequest,
@@ -272,6 +272,9 @@ export type {
   AxiosInstance,
   AxiosRequestConfig,
   AxiosResponse,
+  IResponseInterceptor as ResponseInterceptor,
+  IRequestOptions as RequestOptions,
+  IRequest as Request,
 };
 
 `;
@@ -279,18 +282,29 @@ export type {
         var _a;
         const umiRequestPath = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('@ahooksjs/use-request/package.json')));
         const axiosPath = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('axios/package.json')));
-        const antdPkg = (0, plugin_utils_1.winPath)(
-        // use path from antd plugin first
-        ((_a = api.appData.antd) === null || _a === void 0 ? void 0 : _a.pkgPath) ||
-            (0, path_1.dirname)(require.resolve('antd/package.json')));
+        let dataField = (_a = api.config.request) === null || _a === void 0 ? void 0 : _a.dataField;
+        if (dataField === undefined)
+            dataField = 'data';
+        const formatResult = dataField === '' ? `result => result` : `result => result?.${dataField}`;
         api.writeTmpFile({
             path: 'request.ts',
             content: plugin_utils_1.Mustache.render(requestTpl, {
                 umiRequestPath,
                 axiosPath,
-                antdPkg,
+                formatResult,
             }),
         });
+        api.writeTmpFile({
+            path: 'types.d.ts',
+            content: `
+export type { 
+  RequestConfig,  
+  AxiosInstance,
+  AxiosRequestConfig,
+  AxiosResponse, 
+  ResponseInterceptor } from './request';
+`,
+        });
         api.writeTmpFile({
             path: 'index.ts',
             content: `

package/dist/tailwindcss.js

@@ -18,18 +18,30 @@ exports.default = (api) => {
         const inputPath = (0, path_1.join)(api.cwd, 'tailwind.css');
         const generatedPath = (0, path_1.join)(api.paths.absTmpPath, outputPath);
         const binPath = (0, path_1.join)(api.cwd, 'node_modules/.bin/tailwind');
-        /** 透过子进程建立 tailwindcss 服务，将生成的 css 写入 generatedPath */
-        tailwind = (0, plugin_utils_1.crossSpawn)(`${binPath}`, [
-            '-i',
-            inputPath,
-            '-o',
-            generatedPath,
-            api.env === 'development' ? '--watch' : '',
-        ], {
-            stdio: 'inherit',
-        });
-        tailwind.on('error', (m) => {
-            api.logger.error('tailwindcss service encounter an error: ' + m);
+        return new Promise((resolve) => {
+            /** 透过子进程建立 tailwindcss 服务，将生成的 css 写入 generatedPath */
+            tailwind = (0, plugin_utils_1.crossSpawn)(`${binPath}`, [
+                '-i',
+                inputPath,
+                '-o',
+                generatedPath,
+                api.env === 'development' ? '--watch' : '',
+            ], {
+                stdio: 'inherit',
+            });
+            tailwind.on('error', (m) => {
+                api.logger.error('tailwindcss service encounter an error: ' + m);
+            });
+            if (api.env === 'production') {
+                tailwind.on('exit', () => {
+                    api.logger.info('tailwindcss service exited');
+                    resolve();
+                });
+            }
+            else {
+                api.logger.info('tailwindcss service started');
+                resolve();
+            }
         });
     });
     /** 将生成的 css 文件加入到 import 中 */

package/dist/utils/localeUtils.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNeedPolyfill = exports.exactLocalePaths = exports.getLocaleList = exports.getAntdLocale = exports.getMomentLocale = void 0;
 const fs_1 = require("fs");
@@ -55,7 +46,7 @@ const modulesHasLocale = (localePath) => {
         return false;
     }
 };
-const getLocaleList = (opts) => __awaiter(void 0, void 0, void 0, function* () {
+const getLocaleList = async (opts) => {
     const { localeFolder, separator = '-', absSrcPath = '', absPagesPath = '', addAntdLocales, resolveKey = 'moment', } = opts;
     const localeFileMath = new RegExp(`^([a-z]{2})${separator}?([A-Z]{2})?\.(js|json|ts)$`);
     const localeFiles = plugin_utils_1.glob
@@ -80,11 +71,11 @@ const getLocaleList = (opts) => __awaiter(void 0, void 0, void 0, function* () {
         };
     });
     const groups = plugin_utils_1.lodash.groupBy(localeFiles, 'name');
-    const promises = Object.keys(groups).map((name) => __awaiter(void 0, void 0, void 0, function* () {
+    const promises = Object.keys(groups).map(async (name) => {
         const [lang, country = ''] = name.split(separator);
         const { momentLocale } = (0, exports.getMomentLocale)(lang, country, resolveKey);
         const antdLocale = plugin_utils_1.lodash
-            .uniq(yield addAntdLocales({ lang, country }))
+            .uniq(await addAntdLocales({ lang, country }))
             .filter((localePath) => modulesHasLocale(localePath));
         return {
             lang,
@@ -97,9 +88,9 @@ const getLocaleList = (opts) => __awaiter(void 0, void 0, void 0, function* () {
             paths: groups[name].map((item) => (0, plugin_utils_1.winPath)(item.path)),
             momentLocale,
         };
-    }));
+    });
     return Promise.all(promises);
-});
+};
 exports.getLocaleList = getLocaleList;
 const exactLocalePaths = (data) => {
     return plugin_utils_1.lodash.flatten(data.map((item) => item.paths));

package/dist/utils/modelUtils.d.ts

@@ -7,12 +7,15 @@ interface IOpts {
         content: string;
     }) => Boolean;
 }
+export declare function getNamespace(absFilePath: string, absSrcPath: string): string;
 export declare class Model {
     file: string;
     namespace: string;
     id: string;
     exportName: string;
-    constructor(file: string, id: number);
+    deps: string[];
+    constructor(file: string, absSrcPath: string, sort: {} | undefined, id: number);
+    findDeps(sort: object): string[];
 }
 export declare class ModelUtils {
     api: IApi;
@@ -20,8 +23,10 @@ export declare class ModelUtils {
     count: number;
     constructor(api: IApi | null, opts: IOpts);
     getAllModels(opts: {
+        sort?: object;
         extraModels: string[];
     }): Model[];
+    getSortedNamespaces(models: Model[]): string[];
     getModels(opts: {
         base: string;
         pattern?: string;

package/dist/utils/modelUtils.js

@@ -26,16 +26,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelUtils = exports.Model = void 0;
+exports.ModelUtils = exports.Model = exports.getNamespace = void 0;
 const parser = __importStar(require("@umijs/bundler-utils/compiled/babel/parser"));
 const traverse_1 = __importDefault(require("@umijs/bundler-utils/compiled/babel/traverse"));
+const t = __importStar(require("@umijs/bundler-utils/compiled/babel/types"));
 const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const plugin_utils_1 = require("umi/plugin-utils");
 const astUtils_1 = require("./astUtils");
+function getNamespace(absFilePath, absSrcPath) {
+    const relPath = (0, plugin_utils_1.winPath)((0, path_1.relative)((0, plugin_utils_1.winPath)(absSrcPath), (0, plugin_utils_1.winPath)(absFilePath)));
+    const parts = relPath.split('/');
+    const dirs = parts.slice(0, -1);
+    const file = parts[parts.length - 1];
+    // src/pages/foo/models/bar > foo/bar
+    const validDirs = dirs.filter((dir) => !['src', 'pages', 'models'].includes(dir));
+    let normalizedFile = file;
+    normalizedFile = (0, path_1.basename)(file, (0, path_1.extname)(file));
+    // foo.model > foo
+    if (normalizedFile.endsWith('.model')) {
+        normalizedFile = normalizedFile.split('.').slice(0, -1).join('.');
+    }
+    return [...validDirs, normalizedFile].join('.');
+}
+exports.getNamespace = getNamespace;
 class Model {
-    constructor(file, id) {
+    constructor(file, absSrcPath, sort, id) {
         let namespace;
         let exportName;
         const [_file, meta] = file.split('#');
@@ -46,8 +63,38 @@ class Model {
         }
         this.file = _file;
         this.id = `model_${id}`;
-        this.namespace = namespace || (0, path_1.basename)(file, (0, path_1.extname)(file));
+        this.namespace = namespace || getNamespace(_file, absSrcPath);
         this.exportName = exportName || 'default';
+        this.deps = sort ? this.findDeps(sort) : [];
+    }
+    findDeps(sort) {
+        const content = (0, fs_1.readFileSync)(this.file, 'utf-8');
+        // transform with esbuild first
+        // to reduce unexpected ast problem
+        const loader = (0, path_1.extname)(this.file).slice(1);
+        const result = (0, esbuild_1.transformSync)(content, {
+            loader,
+            sourcemap: false,
+            minify: false,
+        });
+        // transform with babel
+        const deps = new Set();
+        const ast = parser.parse(result.code, {
+            sourceType: 'module',
+            sourceFilename: this.file,
+            plugins: [],
+        });
+        // TODO: use sort
+        sort;
+        (0, traverse_1.default)(ast, {
+            CallExpression: (path) => {
+                if (t.isIdentifier(path.node.callee, { name: 'useModel' }) &&
+                    t.isStringLiteral(path.node.arguments[0])) {
+                    deps.add(path.node.arguments[0].value);
+                }
+            },
+        });
+        return [...deps];
     }
 }
 exports.Model = Model;
@@ -61,7 +108,7 @@ class ModelUtils {
     getAllModels(opts) {
         // reset count
         this.count = 1;
-        return [
+        const models = [
             ...this.getModels({
                 base: (0, path_1.join)(this.api.paths.absSrcPath, 'models'),
                 pattern: '**/*.{ts,tsx,js,jsx}',
@@ -76,8 +123,59 @@ class ModelUtils {
             }),
             ...opts.extraModels,
         ].map((file) => {
-            return new Model(file, this.count++);
+            return new Model(file, this.api.paths.absSrcPath, opts.sort, this.count++);
+        });
+        // check duplicate
+        const namespaces = models.map((model) => model.namespace);
+        if (new Set(namespaces).size !== namespaces.length) {
+            throw new Error(`Duplicate namespace in models: ${namespaces.join(', ')}`);
+        }
+        // sort models by deps
+        if (opts.sort) {
+            const namespaces = this.getSortedNamespaces(models);
+            models.sort((a, b) => namespaces.indexOf(a.namespace) - namespaces.indexOf(b.namespace));
+        }
+        return models;
+    }
+    getSortedNamespaces(models) {
+        let final = [];
+        models.forEach((model, index) => {
+            const { deps, namespace } = model;
+            if (deps && deps.length) {
+                const itemGroup = [...deps, namespace];
+                const cannotUse = [namespace];
+                for (let i = 0; i <= index; i += 1) {
+                    if (models[i].deps.filter((v) => cannotUse.includes(v)).length) {
+                        if (!cannotUse.includes(models[i].namespace)) {
+                            cannotUse.push(models[i].namespace);
+                            i = -1;
+                        }
+                    }
+                }
+                const errorList = deps.filter((v) => cannotUse.includes(v));
+                if (errorList.length) {
+                    throw Error(`Circular dependencies: ${namespace} can't use ${errorList.join(', ')}`);
+                }
+                const intersection = final.filter((v) => itemGroup.includes(v));
+                if (intersection.length) {
+                    // first intersection
+                    const finalIndex = final.indexOf(intersection[0]);
+                    // replace with groupItem
+                    final = final
+                        .slice(0, finalIndex)
+                        .concat(itemGroup)
+                        .concat(final.slice(finalIndex + 1));
+                }
+                else {
+                    final.push(...itemGroup);
+                }
+            }
+            if (!final.includes(namespace)) {
+                // first occurrence append to the end
+                final.push(namespace);
+            }
         });
+        return [...new Set(final)];
     }
     getModels(opts) {
         return plugin_utils_1.glob
@@ -130,11 +228,15 @@ class ModelUtils {
         const imports = [];
         const modelProps = [];
         models.forEach((model) => {
+            const fileWithoutExt = (0, plugin_utils_1.winPath)((0, path_1.format)({
+                dir: (0, path_1.dirname)(model.file),
+                base: (0, path_1.basename)(model.file, (0, path_1.extname)(model.file)),
+            }));
             if (model.exportName !== 'default') {
-                imports.push(`import { ${model.exportName} as ${model.id} } from '${model.file}';`);
+                imports.push(`import { ${model.exportName} as ${model.id} } from '${fileWithoutExt}';`);
             }
             else {
-                imports.push(`import ${model.id} from '${model.file}';`);
+                imports.push(`import ${model.id} from '${fileWithoutExt}';`);
             }
             modelProps.push(`${model.id}: { namespace: '${model.namespace}', model: ${model.id} },`);
         });
@@ -143,7 +245,7 @@ ${imports.join('\n')}
 
 export const models = {
 ${modelProps.join('\n')}
-}`;
+} as const`;
     }
 }
 exports.ModelUtils = ModelUtils;