@ruiapp/rapid-configure-tools 0.5.1 → 0.5.3

package/dist/mod.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var path = require('path');
 var fs = require('fs');
 var lodash = require('lodash');
+var rapidCore = require('@ruiapp/rapid-core');
 var axios = require('axios');
 var axiosCookiejarSupport = require('axios-cookiejar-support');
 var toughCookie = require('tough-cookie');
@@ -15,59 +16,12 @@ var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 
-function ensureDirectoryExists(dirPath) {
-    if (!fs__default["default"].existsSync(dirPath)) {
-        const parentDirPath = path__default["default"].dirname(dirPath);
-        ensureDirectoryExists(parentDirPath);
-        fs__default["default"].mkdirSync(dirPath);
-    }
-}
-function enumFileBaseNamesInDirectory(options) {
-    const { dirPath, prefix, fileNameFilter } = options;
-    let fileNames = [];
-    let resolvedDirPath = dirPath;
-    const isRelative = dirPath.startsWith(".") || dirPath.startsWith("..");
-    if (isRelative) {
-        resolvedDirPath = path__default["default"].join(process.cwd(), dirPath);
-    }
-    if (!fs__default["default"].existsSync(resolvedDirPath)) {
-        console.warn(`Directory '${resolvedDirPath}' not found.`);
-        return [];
-    }
-    const files = fs__default["default"].readdirSync(resolvedDirPath);
-    for (const fileName of files) {
-        const filePathName = path__default["default"].join(resolvedDirPath, fileName);
-        const fileStat = fs__default["default"].statSync(filePathName);
-        if (fileStat.isDirectory()) {
-            fileNames = fileNames.concat(enumFileBaseNamesInDirectory({
-                dirPath: filePathName,
-                prefix: prefix ? `${prefix}/${fileName}` : fileName,
-                fileNameFilter,
-            }));
-        }
-        else if (fileStat.isFile()) {
-            if (fileNameFilter && !fileNameFilter(fileName)) {
-                continue;
-            }
-            const baseName = path__default["default"].parse(fileName).name;
-            if (prefix) {
-                fileNames.push(`${prefix}/${baseName}`);
-            }
-            else {
-                fileNames.push(baseName);
-            }
-        }
-    }
-    fileNames.sort();
-    return fileNames;
-}
-
 /**
  * 用于生成模型索引文件，将模型定义按照类型分别导出。
  */
 function generateEntityModelIndexFilesOfTypeDir({ modelsDir, outputDir, typeDefFilePath, categoryDirName, modelTypeName, modelsFileName, extraImports, modelWrapper, flattenModelArray, }) {
     const filesDir = path__default["default"].join(modelsDir, categoryDirName);
-    const fileNames = enumFileBaseNamesInDirectory({
+    const fileNames = rapidCore.enumFileBaseNamesInDirectory({
         dirPath: filesDir,
         fileNameFilter(fileName) {
             return !(fileName.endsWith(".test.js") || fileName.endsWith(".test.ts"));
@@ -126,7 +80,7 @@ function generateEntityModelIndexFilesOfTypeDir({ modelsDir, outputDir, typeDefF
 }
 function generateModelIndexFilesOfTypeDir({ modelsDir, outputDir, typeDefFilePath, categoryDirName, modelTypeName, modelsFileName, extraImports, modelWrapper, flattenModelArray, }) {
     const filesDir = path__default["default"].join(modelsDir, categoryDirName);
-    const fileNames = enumFileBaseNamesInDirectory({
+    const fileNames = rapidCore.enumFileBaseNamesInDirectory({
         dirPath: filesDir,
         fileNameFilter(fileName) {
             return !(fileName.endsWith(".test.js") || fileName.endsWith(".test.ts"));
@@ -182,7 +136,7 @@ function generateModelIndexFiles(declarationsDirectory) {
     const modelsDir = path__default["default"].join(declarationsDirectory, "models");
     const outputDir = path__default["default"].join(declarationsDirectory, "meta");
     const typeDefFilePath = "@ruiapp/rapid-extension";
-    ensureDirectoryExists(outputDir);
+    rapidCore.ensureDirectoryExists(outputDir);
     generateEntityModelIndexFilesOfTypeDir({
         modelsDir,
         outputDir,
@@ -733,7 +687,7 @@ function newDictionaryEntryUpdater(rapidConfigApi) {
             return entity.name === input.name;
         },
         isEntityChanged(inputEntity, remoteEntity) {
-            const changedFieldNames = detectChangedFields(inputEntity, remoteEntity, ["value", "description", "locales", "deprecated"]);
+            const changedFieldNames = detectChangedFields(inputEntity, remoteEntity, ["value", "description", "color", "icon", "i18n", "locales", "deprecated"]);
             if (changedFieldNames.length) {
                 console.log(`${this.modelType} ${this.inputTitlePrinter(inputEntity)} changed with these fields:`, changedFieldNames);
             }
@@ -747,6 +701,9 @@ function newDictionaryEntryUpdater(rapidConfigApi) {
                 color: input.color,
                 icon: input.icon,
                 description: input.description,
+                i18n: input.i18n,
+                locales: input.locales,
+                deprecated: input.deprecated,
                 orderNum: inputIndex + 1,
                 disabled: false,
             };
@@ -761,6 +718,9 @@ function newDictionaryEntryUpdater(rapidConfigApi) {
                 color: input.color,
                 icon: input.icon,
                 description: input.description,
+                i18n: input.i18n,
+                locales: input.locales,
+                deprecated: input.deprecated,
                 orderNum: inputIndex + 1,
                 disabled: remoteEntity.disabled,
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-configure-tools",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "",
   "main": "dist/mod.js",
   "keywords": [],
@@ -20,7 +20,8 @@
     "axios-cookiejar-support": "^4.0.7",
     "lodash": "^4.17.21",
     "tough-cookie": "^4.1.3",
-    "@ruiapp/rapid-extension": "^0.5.23"
+    "@ruiapp/rapid-core": "^0.9.8",
+    "@ruiapp/rapid-extension": "^0.5.44"
   },
   "dependencies": {},
   "scripts": {

package/src/meta-file-generator/generators/model-index-generator.ts

@@ -5,7 +5,7 @@
 import fs from "fs";
 import { forEach } from "lodash";
 import path from "path";
-import { ensureDirectoryExists, enumFileBaseNamesInDirectory } from "../../utils/file-utility";
+import { ensureDirectoryExists, enumFileBaseNamesInDirectory } from "@ruiapp/rapid-core";
 
 interface GenerateModelsIndexFileOption {
   /**

package/src/rapid-models-updater/DictionaryEntryUpdater.ts

@@ -42,7 +42,7 @@ export function newDictionaryEntryUpdater(rapidConfigApi: AxiosInstance) {
     },
 
     isEntityChanged(inputEntity, remoteEntity) {
-      const changedFieldNames = detectChangedFields(inputEntity, remoteEntity, ["value", "description", "locales", "deprecated"]);
+      const changedFieldNames = detectChangedFields(inputEntity, remoteEntity, ["value", "description", "color", "icon", "i18n", "locales", "deprecated"]);
       if (changedFieldNames.length) {
         console.log(`${this.modelType} ${this.inputTitlePrinter(inputEntity)} changed with these fields:`, changedFieldNames);
       }
@@ -57,6 +57,9 @@ export function newDictionaryEntryUpdater(rapidConfigApi: AxiosInstance) {
         color: input.color,
         icon: input.icon,
         description: input.description,
+        i18n: input.i18n,
+        locales: input.locales,
+        deprecated: input.deprecated,
         orderNum: inputIndex + 1,
         disabled: false,
       };
@@ -72,6 +75,9 @@ export function newDictionaryEntryUpdater(rapidConfigApi: AxiosInstance) {
         color: input.color,
         icon: input.icon,
         description: input.description,
+        i18n: input.i18n,
+        locales: input.locales,
+        deprecated: input.deprecated,
         orderNum: inputIndex + 1,
         disabled: remoteEntity.disabled,
       };

package/dist/utils/file-utility.d.ts

@@ -1,7 +0,0 @@
-export declare function ensureDirectoryExists(dirPath: string): void;
-export type EnumFileBaseNamesOptions = {
-    dirPath: string;
-    prefix?: string;
-    fileNameFilter?: (fileName: string) => boolean;
-};
-export declare function enumFileBaseNamesInDirectory(options: EnumFileBaseNamesOptions): string[];

package/src/utils/file-utility.ts

@@ -1,62 +0,0 @@
-import fs from "fs";
-import path from "path";
-
-export function ensureDirectoryExists(dirPath: string) {
-  if (!fs.existsSync(dirPath)) {
-    const parentDirPath = path.dirname(dirPath);
-    ensureDirectoryExists(parentDirPath);
-
-    fs.mkdirSync(dirPath);
-  }
-}
-
-export type EnumFileBaseNamesOptions = {
-  dirPath: string;
-  prefix?: string;
-  fileNameFilter?: (fileName: string) => boolean;
-};
-
-export function enumFileBaseNamesInDirectory(options: EnumFileBaseNamesOptions): string[] {
-  const { dirPath, prefix, fileNameFilter } = options;
-  let fileNames = [];
-
-  let resolvedDirPath = dirPath;
-  const isRelative = dirPath.startsWith(".") || dirPath.startsWith("..");
-  if (isRelative) {
-    resolvedDirPath = path.join(process.cwd(), dirPath);
-  }
-
-  if (!fs.existsSync(resolvedDirPath)) {
-    console.warn(`Directory '${resolvedDirPath}' not found.`);
-    return [];
-  }
-
-  const files = fs.readdirSync(resolvedDirPath);
-  for (const fileName of files) {
-    const filePathName = path.join(resolvedDirPath, fileName);
-    const fileStat = fs.statSync(filePathName);
-    if (fileStat.isDirectory()) {
-      fileNames = fileNames.concat(
-        enumFileBaseNamesInDirectory({
-          dirPath: filePathName,
-          prefix: prefix ? `${prefix}/${fileName}` : fileName,
-          fileNameFilter,
-        }),
-      );
-    } else if (fileStat.isFile()) {
-      if (fileNameFilter && !fileNameFilter(fileName)) {
-        continue;
-      }
-
-      const baseName = path.parse(fileName).name;
-      if (prefix) {
-        fileNames.push(`${prefix}/${baseName}`);
-      } else {
-        fileNames.push(baseName);
-      }
-    }
-  }
-
-  fileNames.sort();
-  return fileNames;
-}