Merge pull request #126 from contentstack/development

DX | 01-09-2025 | Release

Author: harshithad0703

.github/workflows/node.js.yml

@@ -23,10 +23,11 @@ jobs:
         uses: actions/[email protected]
         with:
           node-version: ${{ matrix.node-version }}
-      - run: | 
+      - run: |
           rm -rf node_modules package-lock.json
           npm i
-      - run: npm test
+      - name: Run tests with coverage
+        run: npm run test:unit:report:json
         env:
           TOKEN: ${{secrets.TOKEN}}
           TOKEN_WITH_NO_CT: ${{secrets.TOKEN_WITH_NO_CT}}
@@ -36,3 +37,9 @@ jobs:
           REGION: ${{secrets.REGION}}
           TOKENTYPE: ${{secrets.TOKENTYPE}}
           BRANCH: ${{secrets.BRANCH}}
+
+      - name: Coverage Report
+        uses: lucassabreu/comment-coverage-clover@main
+        if: github.event_name == 'pull_request'
+        with:
+          file: coverage/clover.xml

.talismanrc

@@ -3,7 +3,7 @@ fileignoreconfig:
     ignore_detectors:
       - filecontent
   - filename: package-lock.json
-    checksum: c447ed3d22eef9d2b26b9ae85370de31be04cc94da0af506ada0025bc7a9bbb6
+    checksum: 371b37886fa8b6f93b82fa66fd82484126809f29b01fd34dfa53322132dccb2e
   - filename: .husky/pre-commit
     checksum: 5baabd7d2c391648163f9371f0e5e9484f8fb90fa2284cfc378732ec3192c193
   - filename: src/graphqlTS/index.ts
@@ -20,4 +20,6 @@ fileignoreconfig:
     checksum: 7c1bc7d659ee2f9f52bf644b9e512984f89e0ff6aa4288b6e30b2c899bf80123
   - filename: src/generateTS/shared/utils.ts
     checksum: da69dab1717422e12f3b3865604667151d46c96bde5faba13ae862c41d856fba
+  - filename: tests/unit/generateTS/generateTS.test.ts
+    checksum: 10e5139168a951a488760626d8305f379db1a7e5df626feb63ef55409ab76a03
 version: "1.0"

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/types-generator",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "Contentstack type definition generation library",
   "private": false,
   "author": "Contentstack",
@@ -11,7 +11,8 @@
     "prepare": "npm run build",
     "build": "tsup",
     "husky-check": "npx husky && chmod +x .husky/pre-commit",
-    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --testPathPattern=tests"
+    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --testPathPattern=tests",
+    "test:unit:report:json": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --testPathPattern=tests/unit --coverage --coverageReporters=clover --coverageReporters=json --coverageDirectory=coverage --testResultsProcessor=jest-json-reporter --outputFile=test-results.json"
   },
   "repository": {
     "type": "git",
@@ -39,6 +40,7 @@
     "dotenv": "^16.6.1",
     "husky": "^9.1.7",
     "jest": "^29.7.0",
+    "jest-json-reporter": "^1.2.2",
     "nock": "^13.5.6",
     "rollup": "^4.48.0",
     "ts-jest": "^29.4.0",

package.json

@@ -546,21 +546,13 @@ export default function (userOptions: TSGenOptions) {
     if (options.includeReferencedEntry) {
       const referencedEntryType = `${options.naming?.prefix || ""}ReferencedEntry`;
 
-      const wrapWithReferencedEntry = (refType: string) =>
-        `(${refType} | ${referencedEntryType})`;
-
-      const types =
-        references.length === 1
-          ? wrapWithReferencedEntry(references[0])
-          : references.map(wrapWithReferencedEntry).join(" | ");
+      const baseUnion = references.join(" | ");
+      const types = `(${baseUnion} | ${referencedEntryType})`;
 
       return `${types}[]`;
     }
-
-    const baseType =
-      references.length === 1 ? references[0] : references.join(" | ");
-
-    return `${baseType}[]`;
+    const baseUnion = references.join(" | ");
+    return `(${baseUnion})[]`;
   }
 
   function type_reference(field: ContentstackTypes.Field) {