get rid of require syntax, use import from

PRIArobotics · Nov 8, 2018 · 0e0f39b · 0e0f39b
1 parent 09087c6
commit 0e0f39b
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 26 deletions.
diff --git a/gsl_protocol_typescript/typescript_target.py b/gsl_protocol_typescript/typescript_target.py
@@ -222,7 +222,7 @@ def init_param_strs(messageClass):
                                            for messageClass in mod.messageClasses
                                            for proto in (messageClass.message.proto,)):
             yield from lines(f"""\
-import {protoName}_pb = require('../proto{'/'.join(('',) + protoPath)}/{protoName}_pb');""")
+import {{ {protoName}_pb }} from '../proto{'/'.join(('',) + protoPath)}';""")
         yield from lines(f"""\
 
 // <default GSL customizable: module-header />""")

diff --git a/hedgehog/client/hedgehogClient.ts b/hedgehog/client/hedgehogClient.ts
@@ -10,7 +10,7 @@ export { IOFlags } from '../protocol/messages/io';
 export { MotorState } from '../protocol/messages/motor';
 export { ProcessFileno } from '../protocol/messages/process';
 
-import zmq = require('zeromq');
+import * as zmq from 'zeromq';
 
 interface CommandHandler<T> {
     resolve: (value?: T | PromiseLike<T>) => void;

diff --git a/hedgehog/protocol/messages/ack.ts b/hedgehog/protocol/messages/ack.ts
@@ -1,7 +1,7 @@
 // tslint:disable
 
 import { RequestMsg, ReplyMsg, message, PayloadCase, Message, ProtoContainerMessage } from './index';
-import ack_pb = require('../proto/ack_pb');
+import { ack_pb } from '../proto';
 
 // <GSL customizable: module-header>
 export let AcknowledgementCode = ack_pb.AcknowledgementCode;

diff --git a/hedgehog/protocol/messages/analog.ts b/hedgehog/protocol/messages/analog.ts
@@ -1,7 +1,7 @@
 // tslint:disable
 
 import { RequestMsg, ReplyMsg, message, PayloadCase, Message, ProtoContainerMessage } from './index';
-import io_pb = require('../proto/io_pb');
+import { io_pb } from '../proto';
 
 // <GSL customizable: module-header>
 type Subscription = any;

diff --git a/hedgehog/protocol/messages/digital.ts b/hedgehog/protocol/messages/digital.ts
@@ -1,7 +1,7 @@
 // tslint:disable
 
 import { RequestMsg, ReplyMsg, message, PayloadCase, Message, ProtoContainerMessage } from './index';
-import io_pb = require('../proto/io_pb');
+import { io_pb } from '../proto';
 
 // <GSL customizable: module-header>
 type Subscription = any;

diff --git a/hedgehog/protocol/messages/index.ts b/hedgehog/protocol/messages/index.ts
@@ -1,12 +1,12 @@
 import { ContainerMessage } from '../../utils/protobuf';
-import hedgehog = require('../proto/hedgehog_pb');
+import { hedgehog_pb } from '../proto';
 
 export { message, Message, ContainerMessage, ProtoContainerMessage } from '../../utils/protobuf';
 
-export let PayloadCase = hedgehog.HedgehogMessage.PayloadCase;
+export let PayloadCase = hedgehog_pb.HedgehogMessage.PayloadCase;
 
 // tslint:disable-next-line:variable-name
-export let RequestMsg = new ContainerMessage(hedgehog.HedgehogMessage);
+export let RequestMsg = new ContainerMessage(hedgehog_pb.HedgehogMessage);
 // tslint:disable-next-line:variable-name
-export let ReplyMsg = new ContainerMessage(hedgehog.HedgehogMessage);
+export let ReplyMsg = new ContainerMessage(hedgehog_pb.HedgehogMessage);
 
diff --git a/hedgehog/protocol/messages/io.ts b/hedgehog/protocol/messages/io.ts
@@ -1,7 +1,7 @@
 // tslint:disable
 
 import { RequestMsg, ReplyMsg, message, PayloadCase, Message, ProtoContainerMessage } from './index';
-import io_pb = require('../proto/io_pb');
+import { io_pb } from '../proto';
 
 // <GSL customizable: module-header>
 export let IOFlags = io_pb.IOFlags;

diff --git a/hedgehog/protocol/messages/motor.ts b/hedgehog/protocol/messages/motor.ts
@@ -1,7 +1,7 @@
 // tslint:disable
 
 import { RequestMsg, ReplyMsg, message, PayloadCase, Message, ProtoContainerMessage } from './index';
-import motor_pb = require('../proto/motor_pb');
+import { motor_pb } from '../proto';
 
 // <GSL customizable: module-header>
 export let MotorState = motor_pb.MotorState;

diff --git a/hedgehog/protocol/messages/process.ts b/hedgehog/protocol/messages/process.ts
@@ -1,7 +1,7 @@
 // tslint:disable
 
 import { RequestMsg, ReplyMsg, message, PayloadCase, Message, ProtoContainerMessage } from './index';
-import process_pb = require('../proto/process_pb');
+import { process_pb } from '../proto';
 
 // <GSL customizable: module-header>
 export let ProcessFileno = process_pb.ProcessFileno;

diff --git a/hedgehog/protocol/messages/servo.ts b/hedgehog/protocol/messages/servo.ts
@@ -1,7 +1,7 @@
 // tslint:disable
 
 import { RequestMsg, ReplyMsg, message, PayloadCase, Message, ProtoContainerMessage } from './index';
-import servo_pb = require('../proto/servo_pb');
+import { servo_pb } from '../proto';
 
 // <GSL customizable: module-header>
 type Subscription = any;

diff --git a/hedgehog/protocol/proto/index.ts b/hedgehog/protocol/proto/index.ts
@@ -0,0 +1,9 @@
+import * as hedgehog_pb from './hedgehog_pb';
+import * as ack_pb from './ack_pb';
+import * as io_pb from './io_pb';
+import * as motor_pb from './motor_pb';
+import * as servo_pb from './servo_pb';
+import * as process_pb from './process_pb';
+import * as subscription_pb from './subscription_pb';
+
+export { hedgehog_pb, ack_pb, io_pb, motor_pb, servo_pb, process_pb, subscription_pb };
diff --git a/test/client.spec.ts b/test/client.spec.ts
@@ -1,8 +1,8 @@
 import "@babel/polyfill";
 
 
-import assert = require('assert');
-import zmq = require('zeromq');
+import * as assert from 'assert';
+import * as zmq from 'zeromq';
 
 import { HedgehogClient } from "../hedgehog";
 import { Message, RequestMsg, ReplyMsg,

diff --git a/test/protocol.spec.ts b/test/protocol.spec.ts
@@ -1,18 +1,10 @@
 import "@babel/polyfill";
 
 
-import assert = require('assert');
-
-// tslint:disable:variable-name
-import hedgehog_pb = require('../hedgehog/protocol/proto/hedgehog_pb');
-import ack_pb = require('../hedgehog/protocol/proto/ack_pb');
-import io_pb = require('../hedgehog/protocol/proto/io_pb');
-import motor_pb = require('../hedgehog/protocol/proto/motor_pb');
-import servo_pb = require('../hedgehog/protocol/proto/servo_pb');
-import process_pb = require('../hedgehog/protocol/proto/process_pb');
-import subscription_pb = require('../hedgehog/protocol/proto/subscription_pb');
-// tslint:enable:variable-name
+import * as assert from 'assert';
 
+import { hedgehog_pb, ack_pb, io_pb, motor_pb, servo_pb, process_pb,
+         subscription_pb } from '../hedgehog/protocol/proto';
 import { RequestMsg, ReplyMsg, Message, ProtoContainerMessage, ContainerMessage,
          ack, io, analog, digital, motor, servo, process } from '../hedgehog/protocol';