@contentstack/cli-audit 1.2.0 → 1.2.1

package/README.md

@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-audit/1.2.0 linux-x64 node-v18.18.2
+@contentstack/cli-audit/1.2.1 linux-x64 node-v18.18.2
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/audit-base-command.js

@@ -147,8 +147,8 @@ class AuditBaseCommand extends base_command_1.BaseCommand {
                 this.log(this.$t(messages_1.auditMsg.NOT_VALID_PATH, { path: ctPath }), 'error');
             }
         }
-        let gfSchema = (0, fs_1.existsSync)(gfPath) ? JSON.parse((0, fs_1.readFileSync)(gfPath, 'utf-8')) : [];
-        let ctSchema = (0, fs_1.existsSync)(ctPath) ? JSON.parse((0, fs_1.readFileSync)(ctPath, 'utf-8')) : [];
+        const gfSchema = (0, fs_1.existsSync)(gfPath) ? JSON.parse((0, fs_1.readFileSync)(gfPath, 'utf8')) : [];
+        const ctSchema = (0, fs_1.existsSync)(ctPath) ? JSON.parse((0, fs_1.readFileSync)(ctPath, 'utf8')) : [];
         return { ctSchema, gfSchema };
     }
     /**

package/lib/modules/entries.d.ts

@@ -22,6 +22,15 @@ export default class Entries {
      * @returns the `missingRefs` object.
      */
     run(): Promise<Record<string, any>>;
+    /**
+     * The function removes any properties from the `missingRefs` object that have an empty array value.
+     */
+    removeEmptyVal(): void;
+    /**
+     * The function `fixPrerequisiteData` fixes the prerequisite data by updating the `ctSchema` and
+     * `gfSchema` properties using the `ContentType` class.
+     */
+    fixPrerequisiteData(): Promise<void>;
     /**
      * The function checks if it can write the fix content to a file and if so, it writes the content as
      * JSON to the specified file path.
@@ -212,7 +221,7 @@ export default class Entries {
      * block in the `tree` array.
      * @returns the `entryBlock` object.
      */
-    modularBlockRefCheck(tree: Record<string, unknown>[], blocks: ModularBlockType[], entryBlock: EntryModularBlocksDataType, index: Number): EntryModularBlocksDataType;
+    modularBlockRefCheck(tree: Record<string, unknown>[], blocks: ModularBlockType[], entryBlock: EntryModularBlocksDataType, index: number): EntryModularBlocksDataType;
     /**
      * The `jsonRefCheck` function checks if a reference exists in a JSON tree and adds missing
      * references to a list if they are not found.

package/lib/modules/entries.js

@@ -34,22 +34,7 @@ class Entries {
             throw new Error((0, messages_1.$t)(messages_1.auditMsg.NOT_VALID_PATH, { path: this.folderPath }));
         }
         await this.prepareEntryMetaData();
-        this.ctSchema = (await new content_types_1.default({
-            fix: true,
-            log: () => { },
-            config: this.config,
-            moduleName: 'content-types',
-            ctSchema: this.ctSchema,
-            gfSchema: this.gfSchema,
-        }).run(true));
-        this.gfSchema = (await new content_types_1.default({
-            fix: true,
-            log: () => { },
-            config: this.config,
-            moduleName: 'entries',
-            ctSchema: this.ctSchema,
-            gfSchema: this.gfSchema,
-        }).run(true));
+        await this.fixPrerequisiteData();
         for (const { code } of this.locales) {
             for (const ctSchema of this.ctSchema) {
                 const basePath = (0, path_1.join)(this.folderPath, ctSchema.uid, code);
@@ -78,12 +63,40 @@ class Entries {
             }
         }
         this.log('', 'info'); // Adding empty line
+        this.removeEmptyVal();
+        return this.missingRefs;
+    }
+    /**
+     * The function removes any properties from the `missingRefs` object that have an empty array value.
+     */
+    removeEmptyVal() {
         for (let propName in this.missingRefs) {
             if (!this.missingRefs[propName].length) {
                 delete this.missingRefs[propName];
             }
         }
-        return this.missingRefs;
+    }
+    /**
+     * The function `fixPrerequisiteData` fixes the prerequisite data by updating the `ctSchema` and
+     * `gfSchema` properties using the `ContentType` class.
+     */
+    async fixPrerequisiteData() {
+        this.ctSchema = (await new content_types_1.default({
+            fix: true,
+            log: () => { },
+            config: this.config,
+            moduleName: 'content-types',
+            ctSchema: this.ctSchema,
+            gfSchema: this.gfSchema,
+        }).run(true));
+        this.gfSchema = (await new content_types_1.default({
+            fix: true,
+            log: () => { },
+            config: this.config,
+            moduleName: 'entries',
+            ctSchema: this.ctSchema,
+            gfSchema: this.gfSchema,
+        }).run(true));
     }
     /**
      * The function checks if it can write the fix content to a file and if so, it writes the content as
@@ -325,10 +338,11 @@ class Entries {
                     if (data_type === 'json') {
                         if (field.field_metadata.extension) {
                             // NOTE Custom field type
-                            return field;
+                            break;
                         }
                         else if (field.field_metadata.allow_json_rte) {
-                            return this.fixJsonRteMissingReferences([...tree, { uid: field.uid, name: field.display_name, data_type: field.data_type }], field, entry[uid]);
+                            this.fixJsonRteMissingReferences([...tree, { uid: field.uid, name: field.display_name, data_type: field.data_type }], field, entry[uid]);
+                            break;
                         }
                     }
                     // NOTE Reference field
@@ -479,7 +493,7 @@ class Entries {
                 data_type: field.data_type,
                 display_name: field.display_name,
                 treeStr: tree
-                    .map(({ name, index }) => (index || index === 0 ? `[${index}].${name}` : name))
+                    .map(({ name, index }) => (index || index === 0 ? `[${+index}].${name}` : name))
                     .filter((val) => val)
                     .join(' ➜ '),
                 missingRefs,
@@ -516,7 +530,7 @@ class Entries {
                 fixStatus: this.fix ? 'Fixed' : undefined,
                 tree: [...tree, { index, uid: key, name: key }],
                 treeStr: [...tree, { index, uid: key, name: key }]
-                    .map(({ name, index }) => (index || index === 0 ? `[${index}].${name}` : name))
+                    .map(({ name, index }) => (index || index === 0 ? `[${+index}].${name}` : name))
                     .filter((val) => val)
                     .join(' ➜ '),
                 missingRefs: [key],
@@ -569,8 +583,8 @@ class Entries {
         const localesFolderPath = (0, path_1.resolve)(this.config.basePath, this.config.moduleConfig.locales.dirName);
         const localesPath = (0, path_1.join)(localesFolderPath, this.config.moduleConfig.locales.fileName);
         const masterLocalesPath = (0, path_1.join)(localesFolderPath, 'master-locale.json');
-        this.locales = (0, values_1.default)(JSON.parse((0, fs_1.readFileSync)(masterLocalesPath, 'utf-8')));
-        this.locales.push(...(0, values_1.default)(JSON.parse((0, fs_1.readFileSync)(localesPath, 'utf-8'))));
+        this.locales = (0, values_1.default)(JSON.parse((0, fs_1.readFileSync)(masterLocalesPath, 'utf8')));
+        this.locales.push(...(0, values_1.default)(JSON.parse((0, fs_1.readFileSync)(localesPath, 'utf8'))));
         for (const { code } of this.locales) {
             for (const { uid } of this.ctSchema) {
                 let basePath = (0, path_1.join)(this.folderPath, uid, code);

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.0",
+  "version": "1.2.1",
   "commands": {
     "cm:stacks:audit:fix": {
       "id": "cm:stacks:audit:fix",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",
@@ -18,8 +18,8 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.14",
-    "@contentstack/cli-utilities": "~1.5.4",
+    "@contentstack/cli-command": "~1.2.15",
+    "@contentstack/cli-utilities": "~1.5.5",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^3.8.4",
     "chalk": "^4.1.2",