Skip to content

Commit 1100f2b

Browse files
committed
Various updates and fixes
1. Added npm/cookie 2. Added npm/cookie-parser 3. Updated npm/body-parser 4. Updated npm/cassandra-driver 5. Updated npm/csv-parse 6. Updated npm/kafka-node 7. Added npm/this-is 8. Updated AngularJS/core dependencies 9. Updated OptionHelper utility 10. Fixed implementation issues with PIXI.js
1 parent db5dd94 commit 1100f2b

File tree

246 files changed

+1032
-552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+1032
-552
lines changed

README.md

Lines changed: 113 additions & 108 deletions
Large diffs are not rendered by default.

browser/angularjs/core/src/main/scala/io/scalajs/npm/angularjs/DependencySet.scala

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,70 +20,70 @@ case class DependencySet(dependencies: js.Array[Any]) extends AnyVal
2020
object DependencySet {
2121

2222
@inline
23-
implicit def fn[R](f: => R): DependencySet = macro generate
23+
implicit def fn[Z](f: => Z): DependencySet = macro generate
2424

2525
@inline
26-
implicit def fn[A, R](f: A => R): DependencySet = macro generate
26+
implicit def fn[A, Z](f: A => Z): DependencySet = macro generate
2727

2828
@inline
29-
implicit def fn[A, B, R](f: (A, B) => R): DependencySet = macro generate
29+
implicit def fn[A, B, Z](f: (A, B) => Z): DependencySet = macro generate
3030

3131
@inline
32-
implicit def fn[A, B, C, R](f: (A, B, C) => R): DependencySet = macro generate
32+
implicit def fn[A, B, C, Z](f: (A, B, C) => Z): DependencySet = macro generate
3333

3434
@inline
35-
implicit def fn[A, B, C, D, R](f: (A, B, C, D) => R): DependencySet = macro generate
35+
implicit def fn[A, B, C, D, Z](f: (A, B, C, D) => Z): DependencySet = macro generate
3636

3737
@inline
38-
implicit def fn[A, B, C, D, E, R](f: (A, B, C, D, E) => R): DependencySet = macro generate
38+
implicit def fn[A, B, C, D, E, Z](f: (A, B, C, D, E) => Z): DependencySet = macro generate
3939

4040
@inline
41-
implicit def fn[A, B, C, D, E, F, R](f: (A, B, C, D, E, F) => R): DependencySet = macro generate
41+
implicit def fn[A, B, C, D, E, F, Z](f: (A, B, C, D, E, F) => Z): DependencySet = macro generate
4242

4343
@inline
44-
implicit def fn[A, B, C, D, E, F, G, R](f: (A, B, C, D, E, F, G) => R): DependencySet = macro generate
44+
implicit def fn[A, B, C, D, E, F, G, Z](f: (A, B, C, D, E, F, G) => Z): DependencySet = macro generate
4545

4646
@inline
47-
implicit def fn[A, B, C, D, E, F, G, H, R](f: (A, B, C, D, E, F, G, H) => R): DependencySet = macro generate
47+
implicit def fn[A, B, C, D, E, F, G, H, Z](f: (A, B, C, D, E, F, G, H) => Z): DependencySet = macro generate
4848

4949
@inline
50-
implicit def fn[A, B, C, D, E, F, G, H, I, R](f: (A, B, C, D, E, F, G, H, I) => R): DependencySet = macro generate
50+
implicit def fn[A, B, C, D, E, F, G, H, I, Z](f: (A, B, C, D, E, F, G, H, I) => Z): DependencySet = macro generate
5151

5252
@inline
53-
implicit def fn[A, B, C, D, E, F, G, H, I, J, R](f: (A, B, C, D, E, F, G, H, I, J) => R): DependencySet = macro generate
53+
implicit def fn[A, B, C, D, E, F, G, H, I, J, Z](f: (A, B, C, D, E, F, G, H, I, J) => Z): DependencySet = macro generate
5454

5555
@inline
56-
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, R](f: (A, B, C, D, E, F, G, H, I, J, K) => R): DependencySet = macro generate
56+
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, Z](f: (A, B, C, D, E, F, G, H, I, J, K) => Z): DependencySet = macro generate
5757

5858
@inline
59-
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, R](f: (A, B, C, D, E, F, G, H, I, J, K, L) => R): DependencySet = macro generate
59+
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, Z](f: (A, B, C, D, E, F, G, H, I, J, K, L) => Z): DependencySet = macro generate
6060

6161
@inline
62-
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, R](f: (A, B, C, D, E, F, G, H, I, J, K, L, M) => R): DependencySet = macro generate
62+
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, Z](f: (A, B, C, D, E, F, G, H, I, J, K, L, M) => Z): DependencySet = macro generate
6363

6464
@inline
65-
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, R](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N) => R): DependencySet = macro generate
65+
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, Z](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N) => Z): DependencySet = macro generate
6666

6767
@inline
68-
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, R](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O) => R): DependencySet = macro generate
68+
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, Z](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O) => Z): DependencySet = macro generate
6969

7070
@inline
71-
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, R](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P) => R): DependencySet = macro generate
71+
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Z](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P) => Z): DependencySet = macro generate
7272

7373
@inline
74-
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, S, R](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, S) => R): DependencySet = macro generate
74+
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, R, Z](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, R) => Z): DependencySet = macro generate
7575

7676
@inline
77-
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, S, R](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, S) => R): DependencySet = macro generate
77+
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, R, S, Z](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, R, S) => Z): DependencySet = macro generate
7878

7979
@inline
80-
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, S, T, R](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, S, T) => R): DependencySet = macro generate
80+
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, R, S, T, Z](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, R, S, T) => Z): DependencySet = macro generate
8181

8282
@inline
83-
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, S, T, U, R](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, S, T, U) => R): DependencySet = macro generate
83+
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, R, S, T, U, Z](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, S, T, U) => Z): DependencySet = macro generate
8484

8585
@inline
86-
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, S, T, U, V, R](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, S, T, U, V) => R): DependencySet = macro generate
86+
implicit def fn[A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, R, S, T, U, V, Z](f: (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, S, T, U, V) => Z): DependencySet = macro generate
8787

8888
def generate(c: blackbox.Context)(f: c.Tree): c.universe.Tree = {
8989
import c.universe._

browser/angularjs/ui-bootstrap/src/main/scala/io/scalajs/npm/angularjs/uibootstrap/Modal.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import scala.scalajs.js
66
import scala.scalajs.js.|
77

88
/**
9-
* AngularJS Modal Service ($modal)
9+
* AngularJS Modal Service (\$modal)
1010
1111
* @see http://angular-ui.github.io/bootstrap/#/modal
1212
*/

browser/angularjs/ui-bootstrap/src/main/scala/io/scalajs/npm/angularjs/uibootstrap/ModalInstance.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package io.scalajs.npm.angularjs.uibootstrap
33
import scala.scalajs.js
44

55
/**
6-
* AngularJS Modal Instance ($modalInstance)
6+
* AngularJS Modal Instance (\$modalInstance)
77
88
*/
99
@js.native

browser/pixijs/src/main/scala/io/scalajs/dom/html/pixijs/PIXI.scala

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.scalajs.dom.html.pixijs
22

3+
import io.scalajs.RawOptions
34
import io.scalajs.dom.DOMHighResTimeStamp
45
import io.scalajs.dom.html.Image
56
import io.scalajs.dom.html.canvas.{CanvasRenderingContext2D, HTMLCanvasElement, WebGLRenderingContext}
@@ -89,6 +90,8 @@ object PIXI extends js.Object {
8990
@JSName("AbstractFilter")
9091
class AbstractFilter(var vertexSrc: String | js.Array[String], var fragmentSrc: String | js.Array[String], var uniforms: js.Object) extends js.Object {
9192

93+
def this() = this(vertexSrc = js.native, fragmentSrc = js.native, uniforms = js.native)
94+
9295
/**
9396
* The extra padding that the filter might need
9497
*/
@@ -275,7 +278,8 @@ object PIXI extends js.Object {
275278
*/
276279
@js.native
277280
@JSName("CanvasRenderer")
278-
class CanvasRenderer(var width: Double = 800, var height: Double = 600, var options: CanvasRendererOptions | js.Any) extends AbstractRenderer {
281+
class CanvasRenderer(var width: Double = js.native, var height: Double = js.native, var options: CanvasRendererOptions | js.Any = js.native)
282+
extends AbstractRenderer {
279283

280284
/**
281285
* Whether the render view should be resized automatically
@@ -636,7 +640,7 @@ object PIXI extends js.Object {
636640
*/
637641
@js.native
638642
@JSName("FXAAFilter")
639-
trait FXAAFilter extends AbstractFilter
643+
class FXAAFilter extends AbstractFilter()
640644

641645
@js.native
642646
@JSName("FilterManager")
@@ -648,7 +652,7 @@ object PIXI extends js.Object {
648652
*/
649653
@js.native
650654
@JSName("Graphics")
651-
trait Graphics extends Container {
655+
class Graphics extends Container {
652656

653657
/**
654658
* The blend mode to be applied to the graphic shape. Apply a value of PIXI.BLEND_MODES.NORMAL to reset the blend mode.
@@ -754,7 +758,7 @@ object PIXI extends js.Object {
754758
* @param newPos The point that the new position is assigned to (allowed to be same as input)
755759
* @return The new point, transformed through this matrix
756760
*/
757-
def apply(pos: Point, newPos: Point = null): Point = js.native
761+
def apply(pos: Point, newPos: Point = js.native): Point = js.native
758762

759763
/**
760764
* Get a new position with the inverse of the current transformation applied. Can be used to go from the world
@@ -763,7 +767,7 @@ object PIXI extends js.Object {
763767
* @param newPos The point that the new position is assigned to (allowed to be same as input)
764768
* @return The new point, inverse-transformed through this matrix
765769
*/
766-
def applyInverse(pos: Point, newPos: Point = null): Point = js.native
770+
def applyInverse(pos: Point, newPos: Point = js.native): Point = js.native
767771

768772
/**
769773
* Creates a new Matrix object with the same values as this one.
@@ -1008,7 +1012,7 @@ object PIXI extends js.Object {
10081012
* This trait serves as a base class for Canvas and WEBGL renderers
10091013
*/
10101014
@js.native
1011-
trait AbstractRenderer extends js.Object
1015+
class AbstractRenderer extends js.Object
10121016

10131017
@js.native
10141018
@JSName("ResourceLoader")
@@ -1026,7 +1030,7 @@ object PIXI extends js.Object {
10261030
*/
10271031
@js.native
10281032
@JSName("Text")
1029-
class Text(var text: String, var style: TextStyle | RawOptions) extends js.Object {
1033+
class Text(var text: String, var style: TextStyleOptions | RawOptions = js.native) extends js.Object {
10301034

10311035
/**
10321036
* The opacity of the object.
@@ -1140,9 +1144,8 @@ object PIXI extends js.Object {
11401144
*/
11411145
@js.native
11421146
@JSName("WebGLRenderer")
1143-
class WebGLRenderer(width: Double = 0, height: Double = 0, options: WebGLRendererOptions | js.Any = null) extends AbstractRenderer {
1144-
1145-
}
1147+
class WebGLRenderer(width: Double = js.native, height: Double = js.native, options: WebGLRendererOptions | js.Any = js.native)
1148+
extends AbstractRenderer
11461149

11471150
/////////////////////////////////////////////////////////////////////////////////
11481151
// Constants
@@ -1220,49 +1223,49 @@ object PIXI extends js.Object {
12201223
*/
12211224
@js.native
12221225
@JSName("AsciiFilter")
1223-
trait AsciiFilter extends AbstractFilter
1226+
class AsciiFilter extends AbstractFilter()
12241227

12251228
/**
12261229
* The BloomFilter applies a Gaussian blur to an object. The strength of the blur can be set for x- and y-axis separately.
12271230
*/
12281231
@js.native
12291232
@JSName("BloomFilter")
1230-
trait BloomFilter extends AbstractFilter
1233+
class BloomFilter extends AbstractFilter()
12311234

12321235
/**
12331236
* The BlurDirFilter applies a Gaussian blur toward a direction to an object.
12341237
*/
12351238
@js.native
12361239
@JSName("BlurDirFilter")
1237-
trait BlurDirFilter extends AbstractFilter
1240+
class BlurDirFilter extends AbstractFilter()
12381241

12391242
/**
12401243
* The BlurFilter applies a Gaussian blur to an object. The strength of the blur can be set for x- and y-axis separately.
12411244
*/
12421245
@js.native
12431246
@JSName("BlurFilter")
1244-
trait BlurFilter extends AbstractFilter
1247+
class BlurFilter extends AbstractFilter()
12451248

12461249
/**
12471250
* The BlurXFilter applies a horizontal Gaussian blur to an object.
12481251
*/
12491252
@js.native
12501253
@JSName("BlurXFilter")
1251-
trait BlurXFilter extends AbstractFilter
1254+
class BlurXFilter extends AbstractFilter()
12521255

12531256
/**
12541257
* The BlurYFilter applies a horizontal Gaussian blur to an object.
12551258
*/
12561259
@js.native
12571260
@JSName("BlurYFilter")
1258-
trait BlurYFilter extends AbstractFilter
1261+
class BlurYFilter extends AbstractFilter()
12591262

12601263
/**
12611264
* The BlurYTintFilter applies a vertical Gaussian blur to an object.
12621265
*/
12631266
@js.native
12641267
@JSName("BlurYTintFilter")
1265-
trait BlurYTintFilter extends AbstractFilter
1268+
class BlurYTintFilter extends AbstractFilter()
12661269

12671270
}
12681271

@@ -1280,7 +1283,7 @@ object PIXI extends js.Object {
12801283
*/
12811284
@js.native
12821285
@JSName("Loader")
1283-
class Loader(baseUrl: String = "", concurrency: Int = 10) extends ResourceLoader
1286+
class Loader(baseUrl: String = js.native, concurrency: Int = js.native) extends ResourceLoader
12841287

12851288
}
12861289

@@ -1403,7 +1406,7 @@ object PIXI extends js.Object {
14031406
* @param context The listener context
14041407
* @return this
14051408
*/
1406-
def add(fn: js.Function, context: js.Function = null): this.type = js.native
1409+
def add(fn: js.Function, context: js.Function = js.native): this.type = js.native
14071410

14081411
/**
14091412
* Calls module:eventemitter3.EventEmitter#once internally for the internal 'tick' event. It checks if the emitter
@@ -1412,7 +1415,7 @@ object PIXI extends js.Object {
14121415
* @param context The listener context
14131416
* @return this
14141417
*/
1415-
def addOnce(fn: js.Function, context: js.Function = null): this.type = js.native
1418+
def addOnce(fn: js.Function, context: js.Function = js.native): this.type = js.native
14161419

14171420
/**
14181421
* Calls module:eventemitter3.EventEmitter#off internally for 'tick' event. It checks if the emitter has listeners
@@ -1421,7 +1424,7 @@ object PIXI extends js.Object {
14211424
* @param context The listener context
14221425
* @return this
14231426
*/
1424-
def remove(fn: js.Function, context: js.Function = null): this.type = js.native
1427+
def remove(fn: js.Function, context: js.Function = js.native): this.type = js.native
14251428

14261429
/**
14271430
* Starts the ticker. If the ticker has listeners a new animation frame is requested at this point.

browser/pixijs/src/main/scala/io/scalajs/dom/html/pixijs/TextStyle.scala renamed to browser/pixijs/src/main/scala/io/scalajs/dom/html/pixijs/TextStyleOptions.scala

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ import scala.scalajs.js.|
2929
3030
*/
3131
@ScalaJSDefined
32-
class TextStyle(var font: String = null,
33-
var fill: String | Double = "black",
34-
var align: String = "left",
35-
var stroke: String | Double = null,
36-
strokeThickness: LineWidth = 0,
37-
wordWrap: Boolean = false,
38-
wordWrapWidth: Int = 100,
39-
lineHeight: Int = 0,
40-
dropShadow: Boolean = false,
41-
dropShadowColor: String = "#000000",
42-
dropShadowAngle: Double = Math.PI / 4,
43-
dropShadowDistance: Int = 5,
44-
padding: Padding = 0,
45-
textBaseline: String = "alphabetic",
46-
lineJoin: String = "miter",
47-
miterLimit: Int = 10) extends js.Object
32+
class TextStyleOptions(var font: js.UndefOr[String] = js.undefined,
33+
var fill: js.UndefOr[String | Double] = js.undefined,
34+
var align: js.UndefOr[String] = js.undefined,
35+
var stroke: js.UndefOr[String | Double] = js.undefined,
36+
strokeThickness: js.UndefOr[LineWidth] = js.undefined,
37+
wordWrap: js.UndefOr[Boolean] = js.undefined,
38+
wordWrapWidth: js.UndefOr[Int] = js.undefined,
39+
lineHeight: js.UndefOr[Int] = js.undefined,
40+
dropShadow: js.UndefOr[Boolean] = js.undefined,
41+
dropShadowColor: js.UndefOr[String] = js.undefined,
42+
dropShadowAngle: js.UndefOr[Double] = js.undefined,
43+
dropShadowDistance: js.UndefOr[Int] = js.undefined,
44+
padding: js.UndefOr[Padding] = js.undefined,
45+
textBaseline: js.UndefOr[String] = js.undefined,
46+
lineJoin: js.UndefOr[String] = js.undefined,
47+
miterLimit: js.UndefOr[Int] = js.undefined) extends js.Object

browser/pixijs/src/main/scala/io/scalajs/dom/html/pixijs/WebGLRendererOptions.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import scala.scalajs.js.annotation.ScalaJSDefined
2020
2121
*/
2222
@ScalaJSDefined
23-
class WebGLRendererOptions(var view: HTMLCanvasElement = null,
24-
var transparent: Boolean = false,
25-
var autoResize: Boolean = false,
26-
var antialias: Boolean = false,
27-
var forceFXAA: Boolean = false,
28-
var resolution: Resolution = 1,
29-
var clearBeforeRender: Boolean = false,
30-
var preserveDrawingBuffer: Boolean = false) extends js.Object
23+
class WebGLRendererOptions(var view: js.UndefOr[HTMLCanvasElement] = js.undefined,
24+
var transparent: js.UndefOr[Boolean] = js.undefined,
25+
var autoResize: js.UndefOr[Boolean] = js.undefined,
26+
var antialias: js.UndefOr[Boolean] = js.undefined,
27+
var forceFXAA: js.UndefOr[Boolean] = js.undefined,
28+
var resolution: js.UndefOr[Resolution] = js.undefined,
29+
var clearBeforeRender: js.UndefOr[Boolean] = js.undefined,
30+
var preserveDrawingBuffer: js.UndefOr[Boolean] = js.undefined) extends js.Object

browser/pixijs/src/main/scala/io/scalajs/dom/html/pixijs/package.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ package object pixijs {
2525

2626
type Resolution = Int
2727

28-
type RawOptions = js.Dictionary[_]
29-
3028
/**
3129
* BaseTexture Events
3230
* @param texture the given [[BaseTexture texture]]

0 commit comments

Comments
 (0)