Move lib/types.ts to src/types/basic.ts

src/compose/service.ts

@@ -23,7 +23,7 @@ import { sanitiseComposeConfig } from './sanitise';
 import { getPathOnHost } from '../lib/fs-utils';
 
 import log from '../lib/supervisor-console';
-import { EnvVarObject } from '../lib/types';
+import { EnvVarObject } from '../types';
 
 const SERVICE_NETWORK_MODE_REGEX = /service:\s*(.+)/;
 const CONTAINER_NETWORK_MODE_REGEX = /container:\s*(.+)/;

src/compose/volume.ts

@@ -7,7 +7,7 @@ import constants = require('../lib/constants');
 import { docker } from '../lib/docker-utils';
 import { InternalInconsistencyError } from '../lib/errors';
 import * as LogTypes from '../lib/log-types';
-import { LabelObject } from '../lib/types';
+import { LabelObject } from '../types';
 import * as logger from '../logger';
 import * as ComposeUtils from './utils';
 

src/config/utils.ts

@@ -4,7 +4,7 @@ import * as Bluebird from 'bluebird';
 import * as config from '../config';
 import * as constants from '../lib/constants';
 import { getMetaOSRelease } from '../lib/os-release';
-import { EnvVarObject } from '../lib/types';
+import { EnvVarObject } from '../types';
 import { allBackends as Backends } from './backends';
 import { ConfigOptions, ConfigBackend } from './backends/backend';
 

src/device-config.ts

@@ -5,7 +5,7 @@ import * as config from './config';
 import * as db from './db';
 import * as logger from './logger';
 import * as dbus from './lib/dbus';
-import { EnvVarObject } from './lib/types';
+import { EnvVarObject } from './types';
 import { UnitNotLoadedError } from './lib/errors';
 import { checkInt, checkTruthy } from './lib/validation';
 import log from './lib/supervisor-console';

src/lib/conversions.ts

@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
 
-import { EnvVarObject } from './types';
+import { EnvVarObject } from '../types';
 
 import log from '../lib/supervisor-console';
 

src/lib/docker-utils.ts

@@ -14,7 +14,7 @@ import {
 	InvalidNetGatewayError,
 } from './errors';
 import * as request from './request';
-import { EnvVarObject } from './types';
+import { EnvVarObject } from '../types';
 
 import log from './supervisor-console';
 

src/lib/validation.ts

@@ -2,7 +2,7 @@ import * as _ from 'lodash';
 import { inspect } from 'util';
 
 import { TargetState } from '../types/state';
-import { EnvVarObject, LabelObject } from './types';
+import { EnvVarObject, LabelObject } from '../types';
 
 import log from './supervisor-console';
 

src/types/index.ts

@@ -0,0 +1,2 @@
+export * from './basic';
+export * from './state';

src/types/state.ts

@@ -1,7 +1,9 @@
+// TODO: move all these exported types to ../compose/types
 import { ComposeNetworkConfig } from '../compose/types/network';
 import { ServiceComposeConfig } from '../compose/types/service';
 import { ComposeVolumeConfig } from '../compose/volume';
-import { EnvVarObject, LabelObject } from '../lib/types';
+
+import { EnvVarObject, LabelObject } from './basic';
 
 import App from '../compose/app';