Commit42525fc

committed

merge from master

2 parentsa3db318 +fa0c2d2 commit42525fcCopy full SHA for 42525fc

File tree

+1080

-558

lines changed

+1080

-558

lines changed

Whitespace-only changes.

Lines changed: 7 additions & 0 deletions

Lines changed: 51 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,51 @@`
	`1`	`+typeidentifier=`
	`2`	`+\|Identifier(string);`
	`3`	`+`
	`4`	`+/* TODO: Add support for JS Modules and JS typeof.*/`
	`5`	`+typet=`
	`6`	`+\|String`
	`7`	`+\|Int`
	`8`	`+\|Float`
	`9`	`+\|Function(function_)`
	`10`	`+\|Array(t)`
	`11`	`+\|Union(array(t))`
	`12`	`+\|Map(t,t)`
	`13`	`+\|Object(object_)`
	`14`	`+\|Promise(t)`
	`15`	`+\|TypeVariable(identifier)`
	`16`	`+andproperty= {`
	`17`	`+ name:identifier,`
	`18`	`+ type_:t,`
	`19`	`+ optional:bool,`
	`20`	`+}`
	`21`	`+and function_ = {`
	`22`	`+arguments: array(property),`
	`23`	`+ returnType: t,`
	`24`	`+}`
	`25`	`+and object_= {`
	`26`	`+ properties: array(property),`
	`27`	`+ extends: identifier,`
	`28`	`+};`
	`29`	`+`
	`30`	`+typetypeBinding= {`
	`31`	`+ name:identifier,`
	`32`	`+ type_:t,`
	`33`	`+ arguments:array(string),`
	`34`	`+};`
	`35`	`+`
	`36`	`+typeclassBinding= {`
	`37`	`+ name:identifier,`
	`38`	`+ type_:t,`
	`39`	`+ arguments:array(string),`
	`40`	`+};`
	`41`	`+`
	`42`	`+typeletBinding= {`
	`43`	`+ name:identifier,`
	`44`	`+ type_:t,`
	`45`	`+ arguments:array(string),`
	`46`	`+};`
	`47`	`+`
	`48`	`+typebinding=`
	`49`	`+\|TypeBinding(typeBinding)`
	`50`	`+\|ClassBinding(classBinding)`
	`51`	`+\|LetBinding(letBinding);`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,14 @@`
	`1`	`+moduleProcess= {`
	`2`	`+typeargv;`
	`3`	`+ [@bs.scope"process"] [@bs.val]externalargv:argv="";`
	`4`	`+};`
	`5`	`+`
	`6`	`+typeprogram;`
	`7`	`+`
	`8`	`+[@bs.module]externalprogram:program="commander";`
	`9`	`+`
	`10`	`+[@bs.send]externalversion: (program,string) =>program="";`
	`11`	`+`
	`12`	`+[@bs.send]externaloption: (program,string) =>program="";`
	`13`	`+`
	`14`	`+[@bs.send]externalparse: (program,Process.argv) =>Js.Json.t="";`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name":"reasonably-typed",`
`3`	`3`	`"version":"0.14",`
`4`		`-"sources": ["bindings","src"],`
	`4`	`+"sources": ["bindings","src","2"],`
`5`	`5`	`"bs-dependencies": ["@glennsl/bs-json","flow-dev-tools"],`
`6`	`6`	`"package-specs": {`
`7`	`7`	`"module":"commonjs"`

Comments

(0)