Merge pull request #110 from contentstack/staging

cs-raj · web-flow · commit 50d26e6764a8 · 2024-05-24T16:39:35.000+05:30
Staging-to-Master | DX | 20-05-2024 | Release
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "contentstack-cli-tsgen",
   "description": "Generate TypeScript typings from a Stack.",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "author": "Michael Davis",
   "bugs": "https://github.com/Contentstack-Solutions/contentstack-cli-tsgen/issues",
   "dependencies": {
diff --git a/src/lib/tsgen/factory.ts b/src/lib/tsgen/factory.ts
@@ -240,7 +240,7 @@ export default function (userOptions: TSGenOptions) {
       define_interface(contentType, options.systemFields),
       '{',
       ['/**', "Version", '*/'].join(' '),
-      [`_version: `,contentType._version,';'].join(' '),
+      [`_version?: `,contentType._version,';'].join(' '),
       visit_fields(contentType.schema),
       '}',
     ]
diff --git a/tests/tsgen/boolean.test.ts b/tests/tsgen/boolean.test.ts
@@ -25,7 +25,7 @@ describe("builtin boolean field", () => {
       "export interface IBoolean
       {
       /** Version */
-      _version:  2 ;
+      _version?:  2 ;
       title: string  ;
       boolean?: boolean  ;
       }"
diff --git a/tests/tsgen/defaults.test.ts b/tests/tsgen/defaults.test.ts
@@ -18,7 +18,7 @@ describe("default single content block", () => {
       "export interface IMetadataSingleContentBlock
       {
       /** Version */
-      _version:  2 ;
+      _version?:  2 ;
       title: string  ;
       }"
     `);
@@ -44,7 +44,7 @@ describe("default single webpage", () => {
       "export interface IMetadataSingleWebpage
       {
       /** Version */
-      _version:  2 ;
+      _version?:  2 ;
       title: string  ;
       url: string  ;
       }"
diff --git a/tests/tsgen/global.fields.test.ts b/tests/tsgen/global.fields.test.ts
@@ -25,7 +25,7 @@ describe("global fields", () => {
       "export interface ISeo
       {
       /** Version */
-      _version:   ;
+      _version?:   ;
       keywords?: string  ;
       description?: string  ;
       }"
@@ -37,7 +37,7 @@ describe("global fields", () => {
       "export interface IGlobalFields
       {
       /** Version */
-      _version:  2 ;
+      _version?:  2 ;
       title: string  ;
       seo?: ISeo  ;
       }"
diff --git a/tests/tsgen/group.test.ts b/tests/tsgen/group.test.ts
@@ -24,7 +24,7 @@ describe("group", () => {
       "export interface Group
       {
       /** Version */
-      _version:  3 ;
+      _version?:  3 ;
       title: string  ;
       multiple_group_max_limit?: [{
       number?: number | null ;
diff --git a/tests/tsgen/isodate.test.ts b/tests/tsgen/isodate.test.ts
@@ -25,7 +25,7 @@ describe("builtin isodate field", () => {
       "export interface Isodate
       {
       /** Version */
-      _version:  2 ;
+      _version?:  2 ;
       title: string  ;
       date?: string | null ;
       date_required: string  ;
diff --git a/tests/tsgen/jsdoc.test.ts b/tests/tsgen/jsdoc.test.ts
@@ -16,7 +16,7 @@ describe("jsdoc", () => {
       export interface Jsdoc
       {
       /** Version */
-      _version:  3 ;
+      _version?:  3 ;
       /** Name */
       title: string  ;
       /** Age */
diff --git a/tests/tsgen/modular.blocks.test.ts b/tests/tsgen/modular.blocks.test.ts
@@ -21,7 +21,7 @@ describe("modular blocks", () => {
       "export interface ModularBlocks
       {
       /** Version */
-      _version:  2 ;
+      _version?:  2 ;
       title: string  ;
       url: string  ;
       modular_blocks?: ({string_block: {single_line?: string  ;
diff --git a/tests/tsgen/number.test.ts b/tests/tsgen/number.test.ts
@@ -22,7 +22,7 @@ describe("builtin number field", () => {
       "export interface Number
       {
       /** Version */
-      _version:  2 ;
+      _version?:  2 ;
       title: string  ;
       url: string  ;
       number?: number | null ;
diff --git a/tests/tsgen/options.test.ts b/tests/tsgen/options.test.ts
@@ -15,7 +15,7 @@ describe("all options", () => {
       "export interface Options
       {
       /** Version */
-      _version:  4 ;
+      _version?:  4 ;
       title: string  ;
       url: string  ;
       single_line_textbox_not_required?: string  ;
diff --git a/tests/tsgen/references.test.ts b/tests/tsgen/references.test.ts
@@ -26,7 +26,7 @@ describe("references", () => {
       "export interface IReferenceParent
       {
       /** Version */
-      _version:  5 ;
+      _version?:  5 ;
       title: string  ;
       url: string  ;
       single_reference: (IReferenceChild)[]  ;
diff --git a/tests/tsgen/select.test.ts b/tests/tsgen/select.test.ts
@@ -21,7 +21,7 @@ describe("select (dropdown)", () => {
       "export interface Select
       {
       /** Version */
-      _version:  5 ;
+      _version?:  5 ;
       title: string  ;
       select_single_value?: (\\"Option 1\\" | \\"Option 2\\" | \\"Option 3\\") | null ;
       select_single_value_required: (\\"Test 1\\" | \\"Test 2\\" | \\"Test 3\\")  ;
diff --git a/tests/tsgen/string.test.ts b/tests/tsgen/string.test.ts
@@ -22,7 +22,7 @@ describe("builtin string fields", () => {
       "export interface BuiltinStrings
       {
       /** Version */
-      _version:  4 ;
+      _version?:  4 ;
       title: string  ;
       single_line?: string  ;
       multi_line?: string  ;
diff --git a/tests/tsgen/taxonomies.test.ts b/tests/tsgen/taxonomies.test.ts
@@ -27,7 +27,7 @@ describe("builtin taxonomies field", () => {
       "export interface ITaxonomy
       {
       /** Version */
-      _version:  2 ;
+      _version?:  2 ;
       title: string  ;
       boolean?: boolean  ;
       taxonomies?: ITaxonomy[]  ;

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "contentstack-cli-tsgen",`
`3`	`3`	`"description": "Generate TypeScript typings from a Stack.",`
`4`		`- "version": "2.3.2",`
	`4`	`+ "version": "2.3.3",`
`5`	`5`	`"author": "Michael Davis",`
`6`	`6`	`"bugs": "https://github.com/Contentstack-Solutions/contentstack-cli-tsgen/issues",`
`7`	`7`	`"dependencies": {`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ export default function (userOptions: TSGenOptions) {`
`240`	`240`	`define_interface(contentType, options.systemFields),`
`241`	`241`	`'{',`
`242`	`242`	`['/*', "Version", '/'].join(' '),`
`243`		- [`_version: `,contentType._version,';'].join(' '),
	`243`	+ [`_version?: `,contentType._version,';'].join(' '),
`244`	`244`	`visit_fields(contentType.schema),`
`245`	`245`	`'}',`
`246`	`246`	`]`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ describe("builtin boolean field", () => {`
`25`	`25`	`"export interface IBoolean`
`26`	`26`	`{`
`27`	`27`	`/** Version */`
`28`		`- _version: 2 ;`
	`28`	`+ _version?: 2 ;`
`29`	`29`	`title: string ;`
`30`	`30`	`boolean?: boolean ;`
`31`	`31`	`}"`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ describe("group", () => {`
`24`	`24`	`"export interface Group`
`25`	`25`	`{`
`26`	`26`	`/** Version */`
`27`		`- _version: 3 ;`
	`27`	`+ _version?: 3 ;`
`28`	`28`	`title: string ;`
`29`	`29`	`multiple_group_max_limit?: [{`
`30`	`30`	`number?: number \| null ;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ describe("builtin isodate field", () => {`
`25`	`25`	`"export interface Isodate`
`26`	`26`	`{`
`27`	`27`	`/** Version */`
`28`		`- _version: 2 ;`
	`28`	`+ _version?: 2 ;`
`29`	`29`	`title: string ;`
`30`	`30`	`date?: string \| null ;`
`31`	`31`	`date_required: string ;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ describe("jsdoc", () => {`
`16`	`16`	`export interface Jsdoc`
`17`	`17`	`{`
`18`	`18`	`/** Version */`
`19`		`- _version: 3 ;`
	`19`	`+ _version?: 3 ;`
`20`	`20`	`/** Name */`
`21`	`21`	`title: string ;`
`22`	`22`	`/** Age */`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ describe("modular blocks", () => {`
`21`	`21`	`"export interface ModularBlocks`
`22`	`22`	`{`
`23`	`23`	`/** Version */`
`24`		`- _version: 2 ;`
	`24`	`+ _version?: 2 ;`
`25`	`25`	`title: string ;`
`26`	`26`	`url: string ;`
`27`	`27`	`modular_blocks?: ({string_block: {single_line?: string ;`