adding apostrophe support in select dropdowns

Author: Michael Davis

README.md

@@ -22,10 +22,10 @@ USAGE
   $ csdx tsgen
 
 OPTIONS
-  -a, --token-alias=token-alias  (required) Delivery token alias
-  -d, --[no-]doc                 Include documentation comments
-  -o, --output=output            (required) Full path to output
-  -p, --prefix=prefix            Interface prefix, e.g. "I"
+  -a, --token-alias=token-alias  (required) delivery token alias
+  -d, --[no-]doc                 include documentation comments
+  -o, --output=output            (required) full path to output
+  -p, --prefix=prefix            interface prefix, e.g. "I"
 
 EXAMPLES
   $ csdx tsgen -a "delivery token alias" -o "contentstack/generated.d.ts"

src/commands/tsgen.ts

@@ -14,23 +14,23 @@ export default class TypeScriptCodeGeneratorCommand extends Command {
   static flags = {
     'token-alias': flags.string({
       char: 'a',
-      description: 'Delivery token alias',
+      description: 'delivery token alias',
       hidden: false,
       multiple: false,
       required: true,
     }),
 
     output: flags.string({
       char: 'o',
-      description: 'Full path to output',
+      description: 'full path to output',
       hidden: false,
       multiple: false,
       required: true,
     }),
 
     prefix: flags.string({
       char: 'p',
-      description: 'Interface prefix, e.g. "I"',
+      description: 'interface prefix, e.g. "I"',
       hidden: false,
       multiple: false,
       default: '',
@@ -39,7 +39,7 @@ export default class TypeScriptCodeGeneratorCommand extends Command {
 
     doc: flags.boolean({
       char: 'd',
-      description: 'Include documentation comments',
+      description: 'include documentation comments',
       default: true,
       allowNo: true,
     }),

src/lib/tsgen/factory.ts

@@ -153,7 +153,7 @@ export default function (userOptions: TSGenOptions) {
         return choice.value
       }
 
-      return `"${choice.value}"`
+      return `${JSON.stringify(choice.value)}`
     }
 
     return op_paren(choices.map(v => get_value(v)).join(' | '))

tests/tsgen/select.ct.js

@@ -1,9 +1,9 @@
 const select = {
   created_at: "2020-07-12T15:19:18.713Z",
-  updated_at: "2020-07-12T15:21:37.840Z",
+  updated_at: "2020-10-28T01:17:25.986Z",
   title: "Select",
   uid: "select",
-  _version: 3,
+  _version: 5,
   inbuilt_class: false,
   schema: [
     {
@@ -77,6 +77,35 @@ const select = {
       unique: false,
       non_localizable: false,
     },
+    {
+      data_type: "text",
+      display_name: "Select Single Value with Quotes",
+      display_type: "dropdown",
+      enum: {
+        advanced: false,
+        choices: [
+          {
+            value: '"ABC"',
+          },
+          {
+            value: "A'B'C",
+          },
+          {
+            value: "`A`B`C",
+          },
+        ],
+      },
+      multiple: false,
+      uid: "select_single_value_with_quotes",
+      field_metadata: {
+        description: "",
+        default_value: "",
+        version: 3,
+      },
+      mandatory: false,
+      unique: false,
+      non_localizable: false,
+    },
     {
       data_type: "text",
       display_name: "Select Multi Value",
@@ -256,5 +285,5 @@ const select = {
 };
 
 module.exports = {
-    select
-}
+  select,
+};

tests/tsgen/select.test.ts

@@ -23,6 +23,7 @@ describe('select (dropdown)', () => {
       title: string;
       select_single_value?: (\\"Option 1\\" | \\"Option 2\\" | \\"Option 3\\");
       select_single_value_required: (\\"Test 1\\" | \\"Test 2\\" | \\"Test 3\\");
+      select_single_value_with_quotes?: (\\"\\\\\\"ABC\\\\\\"\\" | \\"A'B'C\\" | \\"\`A\`B\`C\\");
       select_multi_value?: (\\"Multi 1\\" | \\"Multi 2\\" | \\"Multi 3\\")[];
       select_multi_value_required: (\\"Multi Req 1\\" | \\"Multi Req 2\\" | \\"Multi Req 3\\")[];
       select_number_values?: (1 | 2 | 3 | 4);