feat: fully supporting import flags

parse.js

@@ -511,12 +511,26 @@ function onoptionMap (tokens) {
 
 function onimport (tokens) {
  tokens.shift()
- const file = tokens.shift().replace(/^"+|"+$/gm, '')
+ let token = tokens.shift()
 
- if (tokens[0] !== ';') throw new Error('Unexpected token: ' + tokens[0] + '. Expected ";"')
+ let flag = null
+ if (token === 'public' || token === 'weak') {
+ flag = token
+ token = tokens.shift()
+ }
+ if (!/^".*"$/.test(token)) {
+ throw new Error('Unexpected import <' + token + '>. Expecting a string literal.')
+ }
+ const file = token.replace(/^"+|"+$/gm, '')
 
- tokens.shift()
- return file
+ token = tokens.shift()
+
+ if (token !== ';') throw new Error('Unexpected token: ' + token + '. Expected ";"')
+
+ return {
+ file: file,
+ flag: flag
+ }
 }
 
 function onservice (tokens) {

stringify.js

@@ -1,5 +1,5 @@
 function onimport (i, result) {
- result.push('import "' + i + '";', '')
+ result.push('import ' + (i.flag ? i.flag + ' "' : '"') + i.file + '";', '')
  return result
 }
 

test/fixtures/import.json

@@ -1,7 +1,12 @@
 {
  "syntax": 3,
  "package": null,
- "imports": ["./result.proto", "./other_result.proto"],
+ "imports": [
+ { "file": "./result.proto", "flag": null },
+ { "file": "./other_result.proto", "flag": null },
+ { "file": "./public.proto", "flag": "public" },
+ { "file": "./weak.proto", "flag": "weak" }
+ ],
  "enums": [],
  "extends": [],
  "messages": [

test/fixtures/import.proto

@@ -1,5 +1,7 @@
 import "./result.proto";
 import "./other_result.proto";
+import public "./public.proto";
+import weak "./weak.proto";
 
 message SearchResponse {
  repeated Result result = 1;

test/fixtures/option.json

@@ -2,7 +2,10 @@
  "syntax": 3,
  "package": null,
  "imports": [
- "google/protobuf/descriptor.proto"
+ {
+ "file": "google/protobuf/descriptor.proto",
+ "flag": null
+ }
  ],
  "enums": [
  {

test/fixtures/search.json

@@ -1,7 +1,7 @@
 {
  "syntax": 3,
  "package": null,
- "imports": ["./result.proto"],
+ "imports": [{ "file": "./result.proto", "flag": null }],
  "enums": [],
  "extends": [],
  "messages": [

test/index.js

@@ -53,6 +53,13 @@ tape('schema with imports', function (t) {
  t.end()
 })
 
+tape('schema without quotes', function (t) {
+ t.throws(function () {
+ schema.parse('import foo;')
+ }, /Unexpected import <foo>. Expecting a string literal./)
+ t.end()
+})
+
 tape('schema with imports loaded by path', function (t) {
  t.same(schema.parse(fixture('search.proto')), require('./fixtures/search.json'))
  t.end()