@gadmin2n/prisma-react-generator 0.0.62 → 0.0.64

package/dist/generator/generate-ui-config.js

@@ -81,29 +81,32 @@ function loadConfigFromDirectory(allModels, enums = []) {
         console.log(`Created new config file: config/ui/${model.name}.ts`);
     });
     console.log('Compile UI config files ...');
+    const outDirAbs = path.resolve('../node_modules/.cache/gadmin-ui-config');
+    fs.rmSync(outDirAbs, { recursive: true, force: true });
+    fs.mkdirSync(outDirAbs, { recursive: true });
     const tempTsConfig = {
         compilerOptions: {
             moduleResolution: 'node',
             esModuleInterop: true,
-            outDir: '.',
+            outDir: outDirAbs,
+            rootDir: configDirAbs,
         },
-        include: ['./*.ts'],
-        exclude: ['./*.d.ts'],
+        include: [path.join(configDirAbs, '*.ts')],
+        exclude: [path.join(configDirAbs, '*.d.ts')],
     };
-    const tempTsConfigPath = path.join(configDirAbs, '_tsconfig.tmp.json');
+    const tempTsConfigPath = path.join(outDirAbs, '_tsconfig.tmp.json');
     fs.writeFileSync(tempTsConfigPath, JSON.stringify(tempTsConfig, null, 2));
-    const { code } = shell.cd(configDirAbs).exec('tsc -p _tsconfig.tmp.json');
-    fs.unlinkSync(tempTsConfigPath);
+    const { code } = shell.exec(`tsc -p "${tempTsConfigPath}"`);
     if (code !== 0) {
-        shell.cd('../../server');
         process.exit(code);
     }
     const modelsConfig = {};
     let pageActions = null;
     let PAGE_SIZE = 10;
-    const jsFiles = fs.readdirSync('.')
+    const jsFiles = fs
+        .readdirSync(outDirAbs)
         .filter((file) => file.endsWith('.js') && !file.startsWith('_'));
-    const commonJsPath = path.join(configDirAbs, '_common.js');
+    const commonJsPath = path.join(outDirAbs, '_common.js');
     if (fs.existsSync(commonJsPath)) {
         delete require.cache[require.resolve(commonJsPath)];
         const commonModule = require(commonJsPath);
@@ -115,7 +118,7 @@ function loadConfigFromDirectory(allModels, enums = []) {
         }
     }
     jsFiles.forEach((file) => {
-        const jsFilePath = path.join(configDirAbs, file);
+        const jsFilePath = path.join(outDirAbs, file);
         delete require.cache[require.resolve(jsFilePath)];
         const moduleExports = require(jsFilePath);
         Object.keys(moduleExports).forEach((key) => {
@@ -130,8 +133,6 @@ function loadConfigFromDirectory(allModels, enums = []) {
             }
         });
     });
-    shell.rm('-rf', '*.js');
-    shell.cd('../../server');
     if (!pageActions) {
         pageActions = {
             hasDetailPage: true,

package/dist/generator/index.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const case_1 = require("case");
-const sdk_1 = require("@prisma/sdk");
 const template_helpers_1 = require("./template-helpers");
 const field_classifiers_1 = require("./field-classifiers");
 const generate_resources_1 = require("./generate-resources");
@@ -51,7 +50,6 @@ const run = ({ output, dmmf, ...options }) => {
     const enums = dmmf.schema.enumTypes.model;
     const uiConfig = (0, generate_ui_config_1.addNewModelsConfig)(allModels, enums);
     const modelUIFiles = allModels.map((model) => {
-        sdk_1.logger.info(`Processing Model ${model.name}`);
         const modelDirName = transformFileNameCase(model.name);
         const configFile = {
             fileName: node_path_1.default.join(output, 'props', modelDirName, `config.ts`),
@@ -73,7 +71,6 @@ const run = ({ output, dmmf, ...options }) => {
             }),
         };
         if (existingPageModels === null || existingPageModels === void 0 ? void 0 : existingPageModels.has(modelDirName)) {
-            sdk_1.logger.info(`Skipping page generation for Model ${model.name} (already exists in routes/)`);
             return [configFile, modelFile];
         }
         const createPageFile = {

package/dist/index.js

@@ -22,7 +22,8 @@ const stringToBoolean = (input, defaultValue = false) => {
 };
 exports.stringToBoolean = stringToBoolean;
 const generate = (options) => {
-    const output = (0, sdk_1.parseEnvValue)(options.generator.output);
+    const output = process.env.GADMIN_WEB_STAGING ||
+        (0, sdk_1.parseEnvValue)(options.generator.output);
     const { fileNamingStyle = 'camel', pagesDir, } = options.generator.config;
     const supportedFileNamingStyles = ['kebab', 'camel', 'pascal', 'snake'];
     const isSupportedFileNamingStyle = (style) => supportedFileNamingStyles.includes(style);
@@ -32,13 +33,15 @@ const generate = (options) => {
             .join(', ')}.`);
     }
     const existingPageModels = new Set();
-    if (pagesDir) {
-        const resolvedPagesDir = node_path_1.default.resolve(node_path_1.default.dirname(options.schemaPath), pagesDir);
-        if ((0, node_fs_1.existsSync)(resolvedPagesDir)) {
-            (0, node_fs_1.readdirSync)(resolvedPagesDir, { withFileTypes: true })
-                .filter((e) => e.isDirectory())
-                .forEach((e) => existingPageModels.add(e.name));
-        }
+    const resolvedPagesDir = process.env.GADMIN_WEB_ROUTES_DIR
+        ? process.env.GADMIN_WEB_ROUTES_DIR
+        : pagesDir
+            ? node_path_1.default.resolve(node_path_1.default.dirname(options.schemaPath), pagesDir)
+            : null;
+    if (resolvedPagesDir && (0, node_fs_1.existsSync)(resolvedPagesDir)) {
+        (0, node_fs_1.readdirSync)(resolvedPagesDir, { withFileTypes: true })
+            .filter((e) => e.isDirectory())
+            .forEach((e) => existingPageModels.add(e.name));
     }
     const results = (0, generator_1.run)({
         output,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gadmin2n/prisma-react-generator",
   "description": "Generates react props and components from Prisma Schema for Tea/Antd ui lib.",
-  "version": "0.0.62",
+  "version": "0.0.64",
   "license": "Apache-2.0",
   "author": {
     "name": "kavenma",