Use single quote literals in output for tslint

package.json

@@ -7,7 +7,7 @@
   "scripts": {
     "build": "npm run build-sources && npm test && npm run lint",
     "build-sources": "tsc -p ./tsconfig.json",
-    "build-tests": "tsc -p ./tsconfig.test.json",
+    "build-tests": "rm -rf ./dist_tests && tsc -p ./tsconfig.test.json",
     "watch": "tsc -p ./tsconfig.json --watch && tsc -p ./tsconfig.test.json --watch",
     "lint": "tslint -c tslint.json src/*.ts",
     "test": "npm run build-tests && ava",

src/TsTypes.ts

@@ -103,7 +103,13 @@ export namespace TsType {
   export class Literal extends TsTypeBase {
     constructor(private value: any) { super() }
     _type() {
-      return JSON.stringify(this.value)
+      // if Literal is a string, format result with single quoted string literals
+      var stringValue = JSON.stringify(this.value)
+      const lastPos = stringValue.length - 1
+      if (stringValue.charAt(0) === '"' && stringValue.charAt(lastPos) === '"') {
+        stringValue = `'${stringValue.substring(1, lastPos).replace(/'/g,'\\\'')}'`
+      }
+      return stringValue
     }
   }
 

test/cases/additionalProperties.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "title": "AdditionalProperties",
   "type": "object",
@@ -10,6 +11,7 @@ export var schema = {
     "type": "number"
   }
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var types = `export interface AdditionalProperties {
   foo?: string;

test/cases/allOf.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "title": "AllOf",
   "type": "object",
@@ -30,6 +31,7 @@ export var schema = {
   "required": ["foo", "bar"],
   "additionalProperties": false
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var types = `export interface Foo {
   a: string;

test/cases/anyOf.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "title": "AnyOf",
   "type": "object",
@@ -34,14 +35,14 @@ export var schema = {
   "required": ["foo"],
   "additionalProperties": false
 }
-
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var types = `export interface Foo {
   a: string;
   b?: number;
 }
 export interface Bar {
-  a?: "a" | "b" | "c";
+  a?: 'a' | 'b' | 'c';
   [k: string]: any;
 }
 export interface Baz {

test/cases/array-of-type.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "title": "Array of type",
   "type": "object",
@@ -22,6 +23,7 @@ export var schema = {
     }
   }
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var types =  `export interface ArrayOfType {
   foo?: string[];

test/cases/basics.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "title": "Example Schema",
   "type": "object",
@@ -25,6 +26,7 @@ export var schema = {
   },
   "required": ["firstName", "lastName"]
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var configurations = [
   {

test/cases/disjoint-type.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "title": "Example Schema",
   "description": "My cool schema",
@@ -12,6 +13,7 @@ export var schema = {
   },
   "required": ["value"]
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var types = `/**
  * My cool schema

test/cases/enum.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "title": "Enum",
   "type": "object",
@@ -9,6 +10,10 @@ export var schema = {
     "impliedStringEnum": {
       "enum": ["a", "b", "c"]
     },
+    "literalWithSingleQuote": {
+      "type": "string",
+      "enum": ["Some 'string' with inner single quote", "b", "c"]
+    },
     "booleanEnum": {
       "type" : "boolean",
       "enum": [ true ]
@@ -30,19 +35,20 @@ export var schema = {
     "namedIntegerEnum": {
       "type": "integer",
       "enum": [1, 2, 3],
-      "tsEnumNames": ["One","Two","Three"]
+      "tsEnumNames": ["One", "Two", "Three"]
     },
     "impliedNamedIntegerEnum": {
       "enum": [4, 5, 6],
-      "tsEnumNames": ["Four","Five","Six"]
+      "tsEnumNames": ["Four", "Five", "Six"]
     },
     "impliedHeterogeneousEnum": {
       "enum": [-20.1, null, "foo", false]
     }
   },
-  "required": ["stringEnum", "impliedStringEnum", "booleanEnum", "impliedBooleanEnum", "integerEnum", "impliedIntegerEnum", "impliedNamedIntegerEnum"],
+  "required": ["stringEnum", "impliedStringEnum", "literalWithSingleQuote", "booleanEnum", "impliedBooleanEnum", "integerEnum", "impliedIntegerEnum", "impliedNamedIntegerEnum"],
   "additionalProperties": false
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var configurations = [false, true].map(useConstEnums => {
   return {
@@ -61,16 +67,17 @@ export${useConstEnums ? ' const ' : ' '}enum ImpliedNamedIntegerEnum {
   Six = 6
 }
 export interface Enum {
-  stringEnum: "a" | "b" | "c";
-  impliedStringEnum: "a" | "b" | "c";
+  stringEnum: 'a' | 'b' | 'c';
+  impliedStringEnum: 'a' | 'b' | 'c';
+  literalWithSingleQuote: 'Some \\\'string\\\' with inner single quote' | 'b' | 'c';
   booleanEnum: true;
   impliedBooleanEnum: true;
   integerEnum: -1 | 0 | 1;
   impliedIntegerEnum: -1 | 0 | 1;
   numberEnum?: -1.1 | 0 | 1.2;
   namedIntegerEnum?: NamedIntegerEnum;
   impliedNamedIntegerEnum: ImpliedNamedIntegerEnum;
-  impliedHeterogeneousEnum?: -20.1 | null | "foo" | false;
+  impliedHeterogeneousEnum?: -20.1 | null | 'foo' | false;
 }`
   }
 })

test/cases/enumValidation.5.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "title": "Enum",
   "type": "object",
@@ -11,6 +12,7 @@ export var schema = {
   "required": ["bar"],
   "additionalProperties": false
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var settings = {
   useTypescriptEnums: true

test/cases/enumValidation.6.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "title": "Enum",
   "type": "object",
@@ -11,6 +12,7 @@ export var schema = {
   "required": ["bar"],
   "additionalProperties": false
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var settings = {
   useTypescriptEnums: true

test/cases/json-schema.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
     "id": "http://json-schema.org/draft-04/schema#",
     "$schema": "http://json-schema.org/draft-04/schema#",
@@ -147,7 +148,8 @@ export var schema = {
         "exclusiveMinimum": [ "minimum" ]
     },
     "default": {}
-};
+}
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var configurations = [
 {
@@ -158,7 +160,7 @@ export var configurations = [
 export type PositiveIntegerDefault0 = PositiveInteger;
 export type SchemaArray = HttpJsonSchemaOrgDraft04Schema[];
 export type StringArray = string[];
-export type SimpleTypes = "array" | "boolean" | "integer" | "null" | "number" | "object" | "string";
+export type SimpleTypes = 'array' | 'boolean' | 'integer' | 'null' | 'number' | 'object' | 'string';
 /**
  * Core schema meta-schema
  */
@@ -210,7 +212,7 @@ export interface HttpJsonSchemaOrgDraft04Schema {
     settings: {
         declareSimpleType: false
     },
-    types:`export type SimpleTypes = "array" | "boolean" | "integer" | "null" | "number" | "object" | "string";
+    types:`export type SimpleTypes = 'array' | 'boolean' | 'integer' | 'null' | 'number' | 'object' | 'string';
 /**
  * Core schema meta-schema
  */

test/cases/named-property.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "title": "Example Schema",
   "description": "My cool schema",
@@ -13,6 +14,7 @@ export var schema = {
     }
   }
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 // TODO: 2nd block comment should annotate UserIdArray, not users
 export var types = `export type UserIdArray = string[];

test/cases/not-extendable.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "title": "Example Schema",
   "type": "object",
@@ -17,6 +18,7 @@ export var schema = {
   "required": ["firstName", "lastName"],
   "additionalProperties": false
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var types = `export interface ExampleSchema {
   firstName: string;

test/cases/ref.ts

@@ -1,5 +1,5 @@
-export var schema =
-{
+/* tslint:disable:quotemark object-literal-key-quotes */
+export var schema = {
   "title": "Referencing",
   "type": "object",
   "properties": {
@@ -10,6 +10,7 @@ export var schema =
   "required": ["foo"],
   "additionalProperties": false
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var configurations = [
   {

test/cases/root-anyOf.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "title": "RootAnyOf",
   "anyOf": [
@@ -26,13 +27,14 @@ export var schema = {
     }
   }
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var types = `export interface Foo {
   a: string;
   b?: number;
 }
 export interface Bar {
-  a?: "a" | "b" | "c";
+  a?: 'a' | 'b' | 'c';
   [k: string]: any;
 }
 export interface Baz {

test/cases/unnamedSchema.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "type": "object",
   "properties": {
@@ -8,6 +9,7 @@ export var schema = {
   "required": ["foo"],
   "additionalProperties": false
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var types = `export interface UnnamedSchema {
   foo: string;

test/cases/with-description-newlines.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "title": "Example Schema",
   "description": "My cool schema",
@@ -18,6 +19,7 @@ export var schema = {
   },
   "required": ["firstName", "lastName"]
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var types = `/**
  * My cool schema

test/cases/with-description.ts

@@ -1,3 +1,4 @@
+/* tslint:disable:quotemark object-literal-key-quotes */
 export var schema = {
   "title": "Example Schema",
   "description": "My cool schema",
@@ -17,6 +18,7 @@ export var schema = {
   },
   "required": ["firstName", "lastName"]
 }
+/* tslint:enable:quotemark object-literal-key-quotes */
 
 export var types = `/**
  * My cool schema