Make a directory for support sources

src/cli/GraphQLIntrospection.ts

@@ -1,4 +1,4 @@
-import { panic } from "../quicktype-core/Support";
+import { panic } from "../quicktype-core/support/Support";
 import { introspectionQuery } from "graphql";
 
 const fetch = require("node-fetch");

src/cli/NodeIO.ts

@@ -4,7 +4,7 @@ import { getStream } from "../quicktype-core/get-stream/index";
 
 import { JSONSchemaStore, JSONSchema } from "../quicktype-core/input/JSONSchemaStore";
 import { messageError } from "../quicktype-core/Messages";
-import { parseJSON } from "../quicktype-core/Support";
+import { parseJSON } from "../quicktype-core/support/Support";
 
 // The typings for this module are screwy
 const isURL = require("is-url");

src/cli/PostmanCollection.ts

@@ -1,5 +1,5 @@
 import { JSONTypeSource } from "../quicktype-core/TypeSource";
-import { parseJSON } from "../quicktype-core/Support";
+import { parseJSON } from "../quicktype-core/support/Support";
 
 function isValidJSON(s: string): boolean {
     try {

src/cli/URLGrammar.ts

@@ -1,4 +1,4 @@
-import { panic, checkStringMap, checkArray } from "../quicktype-core/Support";
+import { panic, checkStringMap, checkArray } from "../quicktype-core/support/Support";
 
 function expand(json: any): string[] {
     if (typeof json === "string") {

src/cli/index.ts

@@ -27,7 +27,15 @@ import { urlsFromURLGrammar } from "./URLGrammar";
 import { Annotation } from "../quicktype-core/Source";
 import { IssueAnnotationData } from "../quicktype-core/Annotation";
 import { Readable } from "stream";
-import { panic, assert, defined, withDefault, mapOptional, assertNever, parseJSON } from "../quicktype-core/Support";
+import {
+    panic,
+    assert,
+    defined,
+    withDefault,
+    mapOptional,
+    assertNever,
+    parseJSON
+} from "../quicktype-core/support/Support";
 import { introspectServer } from "./GraphQLIntrospection";
 import { getStream } from "../quicktype-core/get-stream/index";
 import { train } from "../quicktype-core/MarkovChain";

src/quicktype-core/AccessorNames.ts

@@ -1,7 +1,7 @@
 import { Map, Set } from "immutable";
 
 import { TypeAttributeKind, TypeAttributes } from "./TypeAttributes";
-import { defined } from "./Support";
+import { defined } from "./support/Support";
 import { EnumType, UnionType, Type, ObjectType } from "./Type";
 import { messageAssert } from "./Messages";
 

src/quicktype-core/ConvenienceRenderer.ts

@@ -5,7 +5,7 @@ import { Type, ClassType, EnumType, UnionType, TypeKind, ClassProperty, MapType,
 import { separateNamedTypes, nullableFromUnion, matchTypeExhaustive, isNamedType } from "./TypeUtils";
 import { Namespace, Name, Namer, FixedName, SimpleName, DependencyName, keywordNamespace } from "./Naming";
 import { Renderer, BlankLineLocations } from "./Renderer";
-import { defined, panic, nonNull, StringMap, assert } from "./Support";
+import { defined, panic, nonNull, StringMap, assert } from "./support/Support";
 import { Sourcelike, sourcelikeToSource, serializeRenderResult } from "./Source";
 
 import { trimEnd } from "lodash";

src/quicktype-core/CycleBreaker.ts

@@ -1,4 +1,4 @@
-import { assert, panic } from "./Support";
+import { assert, panic } from "./support/Support";
 
 export function breakCycles<T>(outEdges: number[][], chooseBreaker: (cycle: number[]) => [number, T]): [number, T][] {
     const numNodes = outEdges.length;

src/quicktype-core/DeclarationIR.ts

@@ -2,7 +2,7 @@ import { Set, List, OrderedSet, hash } from "immutable";
 
 import { TypeGraph } from "./TypeGraph";
 import { Type } from "./Type";
-import { panic, defined } from "./Support";
+import { panic, defined } from "./support/Support";
 import { Graph } from "./Graph";
 import { messageError } from "./Messages";
 

src/quicktype-core/GatherNames.ts

@@ -5,7 +5,7 @@ import { TypeGraph } from "./TypeGraph";
 import { Type, ObjectType } from "./Type";
 import { matchCompoundType, nullableFromUnion } from "./TypeUtils";
 import { TypeNames, namesTypeAttributeKind, TooManyTypeNames, tooManyNamesThreshold } from "./TypeNames";
-import { defined, panic } from "./Support";
+import { defined, panic } from "./support/Support";
 import { transformationForType } from "./Transformers";
 
 // `gatherNames` infers names from given names and property names.

src/quicktype-core/Graph.ts

@@ -1,5 +1,5 @@
 import { Map, Set, OrderedSet, List } from "immutable";
-import { defined, repeated, assert, repeatedCall } from "./Support";
+import { defined, repeated, assert, repeatedCall } from "./support/Support";
 
 function countComponentGraphNodes(components: number[][]): number {
     if (components.length === 0) return 0;

src/quicktype-core/GraphQL.ts

@@ -14,7 +14,7 @@ import {
     DirectiveNode,
     FieldNode
 } from "graphql/language/ast";
-import { assertNever, panic } from "./Support";
+import { assertNever, panic } from "./support/Support";
 import { TypeBuilder, TypeRef } from "./TypeBuilder";
 import * as graphql from "graphql/language";
 import { TypeNames, makeNamesTypeAttributes, namesTypeAttributeKind } from "./TypeNames";

src/quicktype-core/GraphRewriting.ts

@@ -4,7 +4,7 @@ import { PrimitiveTypeKind, Type, ClassProperty } from "./Type";
 import { combineTypeAttributesOfTypes } from "./TypeUtils";
 import { TypeGraph } from "./TypeGraph";
 import { TypeAttributes, emptyTypeAttributes, combineTypeAttributes } from "./TypeAttributes";
-import { assert, panic, indentationString } from "./Support";
+import { assert, panic, indentationString } from "./support/Support";
 import { TypeRef, TypeBuilder, StringTypeMapping } from "./TypeBuilder";
 
 export interface TypeLookerUp {

src/quicktype-core/MakeTransformations.ts

@@ -5,7 +5,7 @@ import { TargetLanguage } from "./TargetLanguage";
 import { UnionType, TypeKind, EnumType, Type } from "./Type";
 import { GraphRewriteBuilder } from "./GraphRewriting";
 import { TypeRef, StringTypeMapping } from "./TypeBuilder";
-import { defined, assert, panic } from "./Support";
+import { defined, assert, panic } from "./support/Support";
 import {
     UnionInstantiationTransformer,
     DecodingChoiceTransformer,

src/quicktype-core/MarkovChain.ts

@@ -1,4 +1,4 @@
-import { panic, assert, inflateBase64 } from "./Support";
+import { panic, assert, inflateBase64 } from "./support/Support";
 import { encodedMarkovChain } from "./EncodedMarkovChain";
 
 // This must be null, not undefined, because we read it from JSON.

src/quicktype-core/Messages.ts

@@ -1,4 +1,4 @@
-import { StringMap } from "./Support";
+import { StringMap } from "./support/Support";
 import { Ref } from "./input/JSONSchemaInput";
 
 export type ErrorProperties =

src/quicktype-core/Naming.ts

@@ -1,6 +1,6 @@
 import { Set, OrderedSet, List, Map, Collection, hash } from "immutable";
 
-import { defined, assert, panic } from "./Support";
+import { defined, assert, panic } from "./support/Support";
 
 export class Namespace {
     private readonly _name: string;

src/quicktype-core/Renderer.ts

@@ -5,7 +5,7 @@ import { TypeGraph } from "./TypeGraph";
 import { Name, Namespace, assignNames } from "./Naming";
 import { Source, Sourcelike, NewlineSource, annotated, sourcelikeToSource, newline } from "./Source";
 import { AnnotationData, IssueAnnotationData } from "./Annotation";
-import { assert, panic, StringMap } from "./Support";
+import { assert, panic, StringMap } from "./support/Support";
 import { TargetLanguage } from "./TargetLanguage";
 
 export type RenderResult = {

src/quicktype-core/RendererOptions.ts

@@ -1,4 +1,4 @@
-import { assert } from "./Support";
+import { assert } from "./support/Support";
 import { messageError } from "./Messages";
 
 export type OptionKind = "primary" | "secondary";

src/quicktype-core/Run.ts

@@ -4,7 +4,7 @@ import { List, Map, OrderedMap, OrderedSet } from "immutable";
 import * as targetLanguages from "./language/All";
 import { TargetLanguage } from "./TargetLanguage";
 import { SerializedRenderResult, Annotation, Location, Span } from "./Source";
-import { assert, defined } from "./Support";
+import { assert, defined } from "./support/Support";
 import { CompressedJSON } from "./input/CompressedJSON";
 import { combineClasses, findSimilarityCliques } from "./rewrites/CombineClasses";
 import { addTypesInSchema, Ref } from "./input/JSONSchemaInput";

src/quicktype-core/Source.ts

@@ -4,7 +4,7 @@ import { List, Map, Range } from "immutable";
 
 import { AnnotationData } from "./Annotation";
 import { Name } from "./Naming";
-import { intercalate, defined, assertNever, panic, assert, withDefault } from "./Support";
+import { intercalate, defined, assertNever, panic, assert, withDefault } from "./support/Support";
 
 export type Source =
     | TextSource

src/quicktype-core/StringTypes.ts

@@ -1,7 +1,7 @@
 import { is, hash, OrderedMap } from "immutable";
 
 import { TypeAttributeKind } from "./TypeAttributes";
-import { addHashCode, defined, assert } from "./Support";
+import { addHashCode, defined, assert } from "./support/Support";
 import { StringTypeMapping } from "./TypeBuilder";
 import { PrimitiveStringTypeKind } from "./Type";
 

src/quicktype-core/TargetLanguage.ts

@@ -5,7 +5,7 @@ import { Renderer } from "./Renderer";
 import { OptionDefinition, Option } from "./RendererOptions";
 import { serializeRenderResult, SerializedRenderResult } from "./Source";
 import { StringTypeMapping } from "./TypeBuilder";
-import { defined } from "./Support";
+import { defined } from "./support/Support";
 import { ConvenienceRenderer } from "./ConvenienceRenderer";
 import { UnionType } from "./Type";
 

src/quicktype-core/Transformers.ts

@@ -3,7 +3,7 @@ import { OrderedSet, is, hash, List } from "immutable";
 import { UnionType, Type, EnumType, PrimitiveType } from "./Type";
 import { TypeAttributeKind } from "./TypeAttributes";
 import { TypeRef } from "./TypeBuilder";
-import { panic, addHashCode, assert, mapOptional, indentationString } from "./Support";
+import { panic, addHashCode, assert, mapOptional, indentationString } from "./support/Support";
 import { BaseGraphRewriteBuilder } from "./GraphRewriting";
 
 function debugStringForType(t: Type): string {

src/quicktype-core/Type.ts

@@ -1,6 +1,6 @@
 import { OrderedSet, OrderedMap, Set, is, hash, List } from "immutable";
 
-import { defined, panic, assert, mapOptional } from "./Support";
+import { defined, panic, assert, mapOptional } from "./support/Support";
 import { TypeRef } from "./TypeBuilder";
 import { TypeReconstituter, BaseGraphRewriteBuilder } from "./GraphRewriting";
 import { TypeNames, namesTypeAttributeKind } from "./TypeNames";

src/quicktype-core/TypeAttributes.ts

@@ -1,6 +1,6 @@
 import { Map, OrderedSet, hash } from "immutable";
 
-import { panic, setUnion } from "./Support";
+import { panic, setUnion } from "./support/Support";
 import { Type } from "./Type";
 import { BaseGraphRewriteBuilder } from "./GraphRewriting";
 

src/quicktype-core/TypeBuilder.ts

@@ -24,7 +24,7 @@ import {
 import { removeNullFromUnion } from "./TypeUtils";
 import { TypeGraph } from "./TypeGraph";
 import { TypeAttributes, combineTypeAttributes, TypeAttributeKind, emptyTypeAttributes } from "./TypeAttributes";
-import { defined, assert, panic, mapOptional, withDefault } from "./Support";
+import { defined, assert, panic, mapOptional, withDefault } from "./support/Support";
 import { stringTypesTypeAttributeKind, StringTypes } from "./StringTypes";
 
 export class TypeRef {

src/quicktype-core/TypeGraph.ts

@@ -2,7 +2,7 @@ import { Map, List, Set, OrderedSet, Collection } from "immutable";
 
 import { Type, ClassType, ClassProperty, UnionType, IntersectionType } from "./Type";
 import { separateNamedTypes, SeparatedNamedTypes, isNamedType, combineTypeAttributesOfTypes } from "./TypeUtils";
-import { defined, assert, mustNotBeCalled, panic } from "./Support";
+import { defined, assert, mustNotBeCalled, panic } from "./support/Support";
 import {
     TypeRef,
     TypeBuilder,

src/quicktype-core/TypeNames.ts

@@ -2,9 +2,9 @@ import { Set, OrderedSet, Collection } from "immutable";
 import * as pluralize from "pluralize";
 import { Chance } from "chance";
 
-import { panic, defined, assert, mapOptional } from "./Support";
+import { panic, defined, assert, mapOptional } from "./support/Support";
 import { TypeAttributeKind, TypeAttributes } from "./TypeAttributes";
-import { splitIntoWords } from "./Strings";
+import { splitIntoWords } from "./support/Strings";
 
 let chance: Chance.Chance;
 let usedRandomNames: Set<string>;

src/quicktype-core/TypeUtils.ts

@@ -1,6 +1,6 @@
 import { OrderedSet, Collection, Map, Set } from "immutable";
 
-import { defined, panic, assert, assertNever } from "./Support";
+import { defined, panic, assert, assertNever } from "./support/Support";
 import { TypeAttributes, combineTypeAttributes, emptyTypeAttributes, CombinationKind } from "./TypeAttributes";
 import {
     Type,

src/quicktype-core/UnifyClasses.ts

@@ -5,7 +5,7 @@ import { assertIsObject } from "./TypeUtils";
 import { TypeRef, TypeBuilder } from "./TypeBuilder";
 import { TypeLookerUp, GraphRewriteBuilder } from "./GraphRewriting";
 import { UnionBuilder, TypeRefUnionAccumulator } from "./UnionBuilder";
-import { panic, assert, defined, unionOfSets } from "./Support";
+import { panic, assert, defined, unionOfSets } from "./support/Support";
 import { TypeAttributes, combineTypeAttributes, emptyTypeAttributes } from "./TypeAttributes";
 
 function getCliqueProperties(

src/quicktype-core/UnionBuilder.ts

@@ -8,7 +8,7 @@ import {
     emptyTypeAttributes,
     makeTypeAttributesInferred
 } from "./TypeAttributes";
-import { defined, assert, panic, assertNever } from "./Support";
+import { defined, assert, panic, assertNever } from "./support/Support";
 import { TypeRef, TypeBuilder } from "./TypeBuilder";
 import { StringTypes, stringTypesTypeAttributeKind } from "./StringTypes";
 

src/quicktype-core/input/CompressedJSON.ts

@@ -2,7 +2,7 @@ import * as stream from "stream";
 
 import { hash } from "immutable";
 
-import { defined, hashCodeInit, addHashCode, panic, assert } from "../Support";
+import { defined, hashCodeInit, addHashCode, panic, assert } from "../support/Support";
 import { isDate, isTime, isDateTime } from "../DateTime";
 
 const Combo = require("stream-json/Combo");

src/quicktype-core/input/Inference.ts

@@ -1,7 +1,7 @@
 import { OrderedMap, Map } from "immutable";
 
 import { Value, Tag, valueTag, CompressedJSON } from "./CompressedJSON";
-import { assertNever } from "../Support";
+import { assertNever } from "../support/Support";
 import { TypeBuilder, TypeRef } from "../TypeBuilder";
 import { UnionBuilder, UnionAccumulator } from "../UnionBuilder";
 import { isTime, isDateTime, isDate } from "../DateTime";

src/quicktype-core/input/Inputs.ts

@@ -7,7 +7,16 @@ import { Readable } from "stream";
 import { Ref, checkJSONSchema, refsInSchemaForURI } from "./JSONSchemaInput";
 import { Value, CompressedJSON } from "./CompressedJSON";
 import { JSONSchemaStore, JSONSchema } from "./JSONSchemaStore";
-import { parseJSON, panic, assertNever, assert, forEachSync, defined, withDefault, errorMessage } from "../Support";
+import {
+    parseJSON,
+    panic,
+    assertNever,
+    assert,
+    forEachSync,
+    defined,
+    withDefault,
+    errorMessage
+} from "../support/Support";
 import { messageAssert, messageError } from "../Messages";
 import {
     TypeSource,

src/quicktype-core/input/JSONSchemaInput.ts

@@ -17,7 +17,7 @@ import {
     mapOptional,
     isStringMap,
     checkStringMap
-} from "../Support";
+} from "../support/Support";
 import { TypeBuilder, TypeRef } from "../TypeBuilder";
 import { TypeNames } from "../TypeNames";
 import { makeNamesTypeAttributes, modifyTypeNames, singularizeTypeNames } from "../TypeNames";

src/quicktype-core/input/JSONSchemaStore.ts

@@ -1,6 +1,6 @@
 import { Map } from "immutable";
 
-import { StringMap, assert } from "../Support";
+import { StringMap, assert } from "../support/Support";
 import { messageError } from "../Messages";
 
 export type JSONSchema = StringMap | boolean;

src/quicktype-core/language/CPlusPlus.ts

@@ -19,11 +19,11 @@ import {
     firstUpperWordStyle,
     allUpperWordStyle,
     allLowerWordStyle
-} from "../Strings";
-import { defined, assertNever, panic, intercalate } from "../Support";
+} from "../support/Strings";
+import { defined, assertNever, panic, intercalate } from "../support/Support";
 import { ConvenienceRenderer, ForbiddenWordsInfo } from "../ConvenienceRenderer";
 import { StringOption, EnumOption, BooleanOption, Option } from "../RendererOptions";
-import { assert } from "../Support";
+import { assert } from "../support/Support";
 import { Declaration } from "../DeclarationIR";
 
 export type NamingStyle = "pascal" | "camel" | "underscore" | "upper-underscore";

src/quicktype-core/language/CSharp.ts

@@ -12,8 +12,8 @@ import {
     combineWords,
     firstUpperWordStyle,
     camelCase
-} from "../Strings";
-import { intercalate, defined, assert, panic, StringMap } from "../Support";
+} from "../support/Strings";
+import { intercalate, defined, assert, panic, StringMap } from "../support/Support";
 import { Name, DependencyName, Namer, funPrefixNamer } from "../Naming";
 import { ConvenienceRenderer, ForbiddenWordsInfo } from "../ConvenienceRenderer";
 import { TargetLanguage } from "../TargetLanguage";

src/quicktype-core/language/Elm.ts

@@ -19,8 +19,8 @@ import {
     firstUpperWordStyle,
     allLowerWordStyle,
     allUpperWordStyle
-} from "../Strings";
-import { defined, intercalate } from "../Support";
+} from "../support/Strings";
+import { defined, intercalate } from "../support/Support";
 import { Sourcelike, annotated, MultiWord, singleWord, multiWord, parenIfNeeded } from "../Source";
 import { anyTypeIssueAnnotation, nullTypeIssueAnnotation } from "../Annotation";
 

src/quicktype-core/language/Golang.ts

@@ -14,8 +14,8 @@ import {
     firstUpperWordStyle,
     allUpperWordStyle,
     camelCase
-} from "../Strings";
-import { defined } from "../Support";
+} from "../support/Strings";
+import { defined } from "../support/Support";
 import { StringOption, BooleanOption, Option } from "../RendererOptions";
 import { Sourcelike, maybeAnnotated, modifySource } from "../Source";
 import { anyTypeIssueAnnotation, nullTypeIssueAnnotation } from "../Annotation";

src/quicktype-core/language/JSONSchema.ts

@@ -6,8 +6,8 @@ import { matchTypeExhaustive } from "../TypeUtils";
 import { TypeGraph } from "../TypeGraph";
 import { ConvenienceRenderer } from "../ConvenienceRenderer";
 import { Namer, funPrefixNamer, Name } from "../Naming";
-import { legalizeCharacters, splitIntoWords, combineWords, firstUpperWordStyle, allUpperWordStyle } from "../Strings";
-import { defined, assert, panic } from "../Support";
+import { legalizeCharacters, splitIntoWords, combineWords, firstUpperWordStyle, allUpperWordStyle } from "../support/Strings";
+import { defined, assert, panic } from "../support/Support";
 import { StringTypeMapping } from "../TypeBuilder";
 import { descriptionTypeAttributeKind } from "../TypeAttributes";
 import { Option } from "../RendererOptions";

src/quicktype-core/language/Java.ts

@@ -18,13 +18,13 @@ import {
     allUpperWordStyle,
     firstUpperWordStyle,
     allLowerWordStyle
-} from "../Strings";
+} from "../support/Strings";
 import { Name, Namer, funPrefixNamer, DependencyName } from "../Naming";
 import { ConvenienceRenderer, ForbiddenWordsInfo } from "../ConvenienceRenderer";
 import { TargetLanguage } from "../TargetLanguage";
 import { BooleanOption, StringOption, Option } from "../RendererOptions";
 import { anyTypeIssueAnnotation, nullTypeIssueAnnotation } from "../Annotation";
-import { defined, assert, assertNever } from "../Support";
+import { defined, assert, assertNever } from "../support/Support";
 
 export class JavaTargetLanguage extends TargetLanguage {
     private readonly _justTypesOption = new BooleanOption("just-types", "Plain types only", false);

src/quicktype-core/language/JavaScript.ts

@@ -9,8 +9,8 @@ import {
     firstUpperWordStyle,
     allUpperWordStyle,
     camelCase
-} from "../Strings";
-import { intercalate, panic } from "../Support";
+} from "../support/Strings";
+import { intercalate, panic } from "../support/Support";
 
 import { Sourcelike, modifySource } from "../Source";
 import { Namer, Name } from "../Naming";

src/quicktype-core/language/Kotlin.ts

@@ -18,8 +18,8 @@ import {
     legalizeCharacters,
     splitIntoWords,
     utf32ConcatMap
-} from "../Strings";
-import { intercalateArray, mustNotHappen } from "../Support";
+} from "../support/Strings";
+import { intercalateArray, mustNotHappen } from "../support/Support";
 import { TargetLanguage } from "../TargetLanguage";
 import { ArrayType, ClassProperty, ClassType, EnumType, MapType, ObjectType, Type, UnionType } from "../Type";
 import { TypeGraph } from "../TypeGraph";

src/quicktype-core/language/Objective-C.ts

@@ -17,10 +17,10 @@ import {
     utf16LegalizeCharacters,
     stringEscape,
     addPrefixIfNecessary
-} from "../Strings";
+} from "../support/Strings";
 import { ConvenienceRenderer, ForbiddenWordsInfo } from "../ConvenienceRenderer";
 import { StringOption, BooleanOption, EnumOption, Option } from "../RendererOptions";
-import { assert, defined } from "../Support";
+import { assert, defined } from "../support/Support";
 
 const unicode = require("unicode-properties");
 

src/quicktype-core/language/Rust.ts

@@ -14,14 +14,14 @@ import {
     isPrintable,
     isAscii,
     isLetterOrUnderscore
-} from "../Strings";
+} from "../support/Strings";
 import { Name, Namer, funPrefixNamer } from "../Naming";
 import { UnionType, Type, ClassType, EnumType } from "../Type";
 import { matchType, nullableFromUnion, removeNullFromUnion } from "../TypeUtils";
 import { Sourcelike, maybeAnnotated } from "../Source";
 import { anyTypeIssueAnnotation, nullTypeIssueAnnotation } from "../Annotation";
 import { BooleanOption, EnumOption, Option } from "../RendererOptions";
-import { defined } from "../Support";
+import { defined } from "../support/Support";
 
 export enum Density {
     Normal,

src/quicktype-core/language/Swift.ts

@@ -23,8 +23,8 @@ import {
     allUpperWordStyle,
     camelCase,
     addPrefixIfNecessary
-} from "../Strings";
-import { intercalate } from "../Support";
+} from "../support/Strings";
+import { intercalate } from "../support/Support";
 import { List } from "immutable";
 
 const MAX_SAMELINE_PROPERTIES = 4;

src/quicktype-core/language/TypeScriptFlow.ts

@@ -1,14 +1,14 @@
 import { Type, ArrayType, UnionType, ClassType, EnumType } from "../Type";
 import { matchType, nullableFromUnion, isNamedType } from "../TypeUtils";
 import { TypeGraph } from "../TypeGraph";
-import { utf16StringEscape, camelCase } from "../Strings";
+import { utf16StringEscape, camelCase } from "../support/Strings";
 
 import { Sourcelike, modifySource, MultiWord, singleWord, parenIfNeeded, multiWord } from "../Source";
 import { Name } from "../Naming";
 import { ConvenienceRenderer } from "../ConvenienceRenderer";
 import { BooleanOption, Option } from "../RendererOptions";
 import { JavaScriptTargetLanguage, JavaScriptRenderer } from "./JavaScript";
-import { defined, panic } from "../Support";
+import { defined, panic } from "../support/Support";
 import { TargetLanguage } from "../TargetLanguage";
 
 export abstract class TypeScriptFlowBaseTargetLanguage extends JavaScriptTargetLanguage {

src/quicktype-core/language/ruby/index.ts

@@ -24,7 +24,7 @@ import {
     isPrintable,
     escapeNonPrintableMapper,
     intToHex
-} from "../../Strings";
+} from "../../support/Strings";
 
 function unicodeEscape(codePoint: number): string {
     return "\\u{" + intToHex(codePoint, 0) + "}";

src/quicktype-core/rewrites/CombineClasses.ts

@@ -5,7 +5,7 @@ import { nonNullTypeCases, combineTypeAttributesOfTypes } from "../TypeUtils";
 
 import { TypeRef, StringTypeMapping } from "../TypeBuilder";
 import { GraphRewriteBuilder } from "../GraphRewriting";
-import { assert, panic } from "../Support";
+import { assert, panic } from "../support/Support";
 import { TypeGraph } from "../TypeGraph";
 import { unifyTypes, unionBuilderForUnification } from "../UnifyClasses";
 

src/quicktype-core/rewrites/ExpandStrings.ts

@@ -5,7 +5,7 @@ import { stringTypesForType } from "../TypeUtils";
 import { TypeGraph } from "../TypeGraph";
 import { TypeRef, StringTypeMapping } from "../TypeBuilder";
 import { GraphRewriteBuilder } from "../GraphRewriting";
-import { assert, defined } from "../Support";
+import { assert, defined } from "../support/Support";
 import { emptyTypeAttributes } from "../TypeAttributes";
 import { StringTypes } from "../StringTypes";
 

src/quicktype-core/rewrites/FlattenStrings.ts

@@ -5,7 +5,7 @@ import { stringTypesForType, combineTypeAttributesOfTypes } from "../TypeUtils";
 import { TypeGraph } from "../TypeGraph";
 import { TypeRef, StringTypeMapping } from "../TypeBuilder";
 import { GraphRewriteBuilder } from "../GraphRewriting";
-import { assert, defined } from "../Support";
+import { assert, defined } from "../support/Support";
 import { combineTypeAttributes } from "../TypeAttributes";
 
 // A union needs replacing if it contains more than one string type, one of them being

src/quicktype-core/rewrites/FlattenUnions.ts

@@ -3,7 +3,7 @@ import { Set, OrderedSet } from "immutable";
 import { TypeGraph } from "../TypeGraph";
 import { Type, UnionType, IntersectionType } from "../Type";
 import { makeGroupsToFlatten } from "../TypeUtils";
-import { assert } from "../Support";
+import { assert } from "../support/Support";
 import { TypeRef, StringTypeMapping } from "../TypeBuilder";
 import { GraphRewriteBuilder } from "../GraphRewriting";
 import { unifyTypes, UnifyUnionBuilder } from "../UnifyClasses";

src/quicktype-core/rewrites/InferMaps.ts

@@ -2,7 +2,7 @@ import { Map, Set, OrderedSet } from "immutable";
 
 import { Type, ClassType, setOperationCasesEqual, ClassProperty } from "../Type";
 import { removeNullFromType } from "../TypeUtils";
-import { defined, panic } from "../Support";
+import { defined, panic } from "../support/Support";
 import { TypeGraph } from "../TypeGraph";
 import { TypeRef, StringTypeMapping } from "../TypeBuilder";
 import { GraphRewriteBuilder } from "../GraphRewriting";

src/quicktype-core/rewrites/ReplaceObjectType.ts

@@ -4,7 +4,7 @@ import { TypeGraph } from "../TypeGraph";
 import { StringTypeMapping, TypeRef } from "../TypeBuilder";
 import { GraphRewriteBuilder } from "../GraphRewriting";
 import { ObjectType, ClassProperty } from "../Type";
-import { defined } from "../Support";
+import { defined } from "../support/Support";
 import { emptyTypeAttributes } from "../TypeAttributes";
 
 export function replaceObjectType(

src/quicktype-core/rewrites/ResolveIntersections.ts

@@ -18,7 +18,7 @@ import {
     ObjectType
 } from "../Type";
 import { setOperationMembersRecursively, matchTypeExhaustive, makeGroupsToFlatten } from "../TypeUtils";
-import { assert, defined, panic, mustNotHappen } from "../Support";
+import { assert, defined, panic, mustNotHappen } from "../support/Support";
 import {
     combineTypeAttributes,
     TypeAttributes,

src/quicktype-core/support/Strings.ts

@@ -3,7 +3,7 @@ import { Set } from "immutable";
 import { assert, defined, panic } from "./Support";
 import { acronyms } from "./Acronyms";
 import * as _ from "lodash";
-import { messageAssert } from "./Messages";
+import { messageAssert } from "../Messages";
 
 const unicode = require("unicode-properties");
 

src/quicktype-core/support/Support.ts

@@ -2,7 +2,7 @@ import { Collection, List, Set, isKeyed, isIndexed } from "immutable";
 
 import { Base64 } from "js-base64";
 import * as pako from "pako";
-import { messageError } from "./Messages";
+import { messageError } from "../Messages";
 
 export function intercalate<T>(separator: T, items: Collection<any, T>): List<T> {
     const acc: T[] = [];

src/quicktype-typescript-input/index.ts

@@ -1,7 +1,7 @@
 import * as ts from "typescript";
 import { PartialArgs, CompilerOptions, generateSchema } from "typescript-json-schema";
 
-import { panic, inflateBase64, defined } from "../quicktype-core/Support";
+import { panic, inflateBase64, defined } from "../quicktype-core/support/Support";
 import { encodedDefaultTypeScriptLibrary } from "./EncodedDefaultTypeScriptLibrary";
 import { SchemaTypeSource } from "../quicktype-core/TypeSource";
 import { messageError } from "../quicktype-core/Messages";

test/fixtures.ts

@@ -21,7 +21,7 @@ import {
 } from "./utils";
 import * as languages from "./languages";
 import { RendererOptions } from "../dist/quicktype-core/Run";
-import { mustNotBeCalled } from "../dist/quicktype-core/Support";
+import { mustNotBeCalled } from "../dist/quicktype-core/support/Support";
 import { isDateTime } from "../dist/quicktype-core/DateTime";
 
 const chalk = require("chalk");