Skip to content

Commit 9fc573e

Browse files
committed
HeaderSpec can't run on JS
1 parent 01211c6 commit 9fc573e

File tree

7 files changed

+272
-32
lines changed

7 files changed

+272
-32
lines changed

.mill-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.10.4
1+
0.10.5

LICENSE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# jsonrpclib
2+
3+
This is a cross-platform, cross-scala-version [jsonrpc](https://www.jsonrpc.org/) library that provides construct for bidirectional communication using
4+
the jsonrpc protocol.
5+
6+
This library does not enforce any transport, and works as long as you can provide input/output byte streams.
7+
8+
19
## Dev Notes
210

311
### Scala-native

build.sc

Lines changed: 58 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
import $ivy.`com.lihaoyi::mill-contrib-bloop:$MILL_VERSION`
2-
import $ivy.`io.github.davidgregory084::mill-tpolecat::0.3.0`
2+
import $ivy.`io.github.davidgregory084::mill-tpolecat::0.3.1`
3+
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.1.4`
34

45
import os.Path
56
import mill._
67
import scalalib._
8+
import publish._
79
import scalajslib._
810
import scalanativelib._
911
import mill.scalajslib.api._
10-
import io.github.davidgregory084.TpolecatModule
12+
import io.github.davidgregory084._
13+
import de.tobiasroeser.mill.vcs.version.VcsVersion
1114

1215
object versions {
1316
val scala212Version = "2.12.16"
1417
val scala213Version = "2.13.8"
1518
val scala3Version = "3.1.2"
16-
val scalaJSVersion = "1.10.0"
19+
val scalaJSVersion = "1.10.1"
1720
val scalaNativeVersion = "0.4.4"
1821
val munitVersion = "0.7.29"
1922

2023
val scala213 = "2.13"
2124
val scala212 = "2.12"
22-
val scala3 = "scala3"
25+
val scala3 = "3"
2326

2427
val crossMap = Map(
2528
"2.13" -> scala213Version,
@@ -94,6 +97,7 @@ trait RPCCrossPlatformModule extends Module { shared =>
9497
}
9598

9699
trait Tests extends super.Tests {
100+
override def sources = T.sources(computeSources(this).map(PathRef(_)))
97101
override def moduleDeps = super.moduleDeps ++ shared.crossPlatformTestModuleDeps.flatMap(matchingCross)
98102
}
99103
}
@@ -119,6 +123,7 @@ trait RPCCrossPlatformModule extends Module { shared =>
119123
}
120124

121125
trait Tests extends super.Tests with mill.contrib.Bloop.Module {
126+
override def sources = T.sources(computeSources(this).map(PathRef(_)))
122127
override def skipIdea = true
123128
override def skipBloop = true
124129
override def moduleDeps = super.moduleDeps ++ shared.crossPlatformTestModuleDeps.flatMap(matchingCross).collect {
@@ -152,6 +157,7 @@ trait RPCCrossPlatformModule extends Module { shared =>
152157
override def nativeLinkStubs = true
153158
override def skipIdea = true
154159
override def skipBloop = true
160+
override def sources = T.sources(computeSources(this).map(PathRef(_)))
155161
override def moduleDeps = super.moduleDeps ++ shared.crossPlatformTestModuleDeps.flatMap(matchingCross).collect {
156162
case m: ScalaNativeModule => m
157163
}
@@ -200,28 +206,35 @@ trait RPCCrossPlatformModule extends Module { shared =>
200206

201207
override def artifactName = shared.artifactName
202208

203-
override def sources = self match {
204-
case _: ScalaJSModule =>
205-
T.sources(
206-
millSourcePath / 'src,
207-
millSourcePath / s"src-js",
208-
millSourcePath / s"src-jvm-js"
209-
)
210-
case _: ScalaNativeModule =>
211-
T.sources(
212-
millSourcePath / 'src,
213-
millSourcePath / s"src-jvm-native",
214-
millSourcePath / s"src-native"
215-
)
216-
case _ =>
217-
T.sources(
218-
millSourcePath / 'src,
219-
millSourcePath / s"src-jvm",
220-
millSourcePath / s"src-jvm-js",
221-
millSourcePath / s"src-jvm-native"
222-
)
209+
def computeSources(module: mill.define.Module): Seq[os.Path] = {
210+
val modulePath = module.millSourcePath
211+
module match {
212+
case _: ScalaJSModule =>
213+
Seq(
214+
modulePath / 'src,
215+
modulePath / s"src-js",
216+
modulePath / s"src-jvm-js",
217+
modulePath / s"src-js-native"
218+
)
219+
case _: ScalaNativeModule =>
220+
Seq(
221+
modulePath / 'src,
222+
modulePath / s"src-native",
223+
modulePath / s"src-jvm-native",
224+
modulePath / s"src-js-native"
225+
)
226+
case _ =>
227+
Seq(
228+
modulePath / 'src,
229+
modulePath / s"src-jvm",
230+
modulePath / s"src-jvm-js",
231+
modulePath / s"src-jvm-native"
232+
)
233+
}
223234
}
224235

236+
override def sources = T.sources(computeSources(self).map(PathRef(_)))
237+
225238
override def skipBloop = {
226239
self match {
227240
case _: ScalaJSModule => true
@@ -233,9 +246,29 @@ trait RPCCrossPlatformModule extends Module { shared =>
233246
}
234247
}
235248

236-
trait JsonRPCModule extends ScalaModule with TpolecatModule with scalafmt.ScalafmtModule {
249+
trait JsonRPCModule extends ScalaModule with PublishModule with scalafmt.ScalafmtModule {
237250
def scalafmt() = T.command(reformat())
238251
def fmt() = T.command(reformat())
239252
def refreshedEnv = T.input(T.ctx().env)
253+
def publishVersion = T {
254+
if (refreshedEnv().contains("CI")) {
255+
VcsVersion.vcsState().format().drop("v".length)
256+
} else "dev"
257+
}
258+
override def scalacOptions = T {
259+
super.scalacOptions() ++ Tpolecat.scalacOptionsFor(scalaVersion())
260+
}
261+
240262
override def forkEnv = T { refreshedEnv() }
263+
264+
def pomSettings = PomSettings(
265+
description = "A Scala jsonrpc library",
266+
organization = "tech.neander",
267+
url = "https://github.com/neandertech/jsonrpclib",
268+
licenses = Seq(License.`Apache-2.0`),
269+
versionControl = VersionControl(Some("https://github.com/neandertech/jsonrpclib")),
270+
developers = Seq(
271+
Developer("Baccata", "Olivier Mélois", "https://github.com/baccata")
272+
)
273+
)
241274
}

core/src/jsonrpclib/Channel.scala

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package jsonrpclib
22

3-
import jsonrpclib.StubTemplate.NotificationTemplate
4-
import jsonrpclib.StubTemplate.RequestResponseTemplate
5-
63
trait Channel[F[_]] {
74
def mountEndpoint(endpoint: Endpoint[F]): F[Unit]
85
def unmountEndpoint(method: String): F[Unit]
@@ -19,11 +16,11 @@ object Channel {
1916

2017
final def stub[In, Err, Out](template: StubTemplate[In, Err, Out]): In => F[Either[Err, Out]] =
2118
template match {
22-
case NotificationTemplate(method, inCodec) =>
19+
case StubTemplate.RequestResponseTemplate(method, inCodec, errCodec, outCodec) =>
20+
stub(method)(inCodec, errCodec, outCodec)
21+
case StubTemplate.NotificationTemplate(method, inCodec) =>
2322
val stub = notificationStub(method)(inCodec)
2423
(in: In) => F.doFlatMap(stub(in))(unit => F.doPure(Right(unit)))
25-
case RequestResponseTemplate(method, inCodec, errCodec, outCodec) =>
26-
stub(method)(inCodec, errCodec, outCodec)
2724
}
2825

2926
final def simpleStub[In: Codec, Out: Codec](method: String): In => F[Out] = {

core/src/jsonrpclib/StubTemplate.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ object StubTemplate {
1414
method: String,
1515
inCodec: Codec[In]
1616
) extends StubTemplate[In, Nothing, Unit]
17+
1718
final case class RequestResponseTemplate[In, Err, Out](
1819
method: String,
1920
inCodec: Codec[In],

0 commit comments

Comments
 (0)