Skip to content

Commit

Permalink
Merge pull request #204 from p2m2/develop
Browse files Browse the repository at this point in the history
0.4.3
  • Loading branch information
ofilangi committed Mar 8, 2023
2 parents 361d31a + df756df commit f8b3da7
Show file tree
Hide file tree
Showing 11 changed files with 9,907 additions and 4,351 deletions.
5 changes: 5 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,13 @@ jobs:
## bug with Node 17 -> https://github.com/webpack/webpack/issues/14532
export NODE_OPTIONS=--openssl-legacy-provider
sbt discoveryJS/fastOptJS/webpack
sbt discoveryJS/fullOptJS/webpack
sbt npmPackageJson
npm i
npm link
cd ts
npm link @p2m2/discovery
cd ..
npm test
publish_snapshot:
Expand Down
9 changes: 5 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import sbtcrossproject.CrossPlugin.autoImport.crossProject
lazy val comunica_query_sparql_version = "2.6.6b"
lazy val data_model_rdfjs_version = "1.0.2"
lazy val n3js_facade_version = "1.16.3"
lazy val rdfxml_streaming_parser_version = "1.5.1"
lazy val rdfxml_streaming_parser_version = "2.2.1"
lazy val axios_version = "1.3.2"
//lazy val scalaJsMacrotaskExecutor = "1.0.0"

/* npm libs */
lazy val npm_axios_version = "1.3.2"
lazy val npm_axios_version = "1.3.4"
lazy val npm_qs_version = "6.11.0"
lazy val npm_showdown_version = "2.1.0"
lazy val npm_comunica_version_datasource = "1.22.2"
Expand All @@ -26,7 +26,7 @@ lazy val tsjest = "29.0.5"

releaseIgnoreUntrackedFiles := true

val static_version_build = "0.4.2"
val static_version_build = "0.4.3"
val version_build = scala.util.Properties.envOrElse("DISCOVERY_VERSION", static_version_build)
val SWDiscoveryVersionAtBuildTimeFile = "./shared/src/main/scala/fr/inrae/metabohub" +
"/semantic_web/SWDiscoveryVersionAtBuildTime.scala"
Expand Down Expand Up @@ -105,7 +105,7 @@ lazy val discovery=
.in(file("."))
.settings(
libraryDependencies ++= Seq(
"com.softwaremill.sttp.client3" %% "core" % "3.8.11" % Test,
"com.softwaremill.sttp.client3" %% "core" % "3.8.12" % Test,
"com.lihaoyi" %%% "utest" % "0.8.1" % Test,
"com.lihaoyi" %%% "upickle" % "3.0.0-M2",
"org.wvlet.airframe" %%% "airframe-log" % "23.2.3",
Expand Down Expand Up @@ -208,6 +208,7 @@ s"""{
"description": "${(ThisBuild / description).value}",
"version": "${(ThisBuild / version).value}",
"main": "./js/target/scala-2.13/scalajs-bundler/main/discovery-opt.js",
"types": "./ts/types/discovery.d.ts",
"files": [
"js/target/scala-2.13/scalajs-bundler/main/discovery-opt.js"
],
Expand Down
14,072 changes: 9,742 additions & 4,330 deletions dist/discovery-web-dev.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/discovery-web-dev.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/discovery-web.js

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions ts/tests/github.issues.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SWDiscoveryConfiguration , SWDiscovery, URI } from "../../js/target/scala-2.13/scalajs-bundler/main/discovery-fastopt";
import { SWDiscoveryConfiguration , SWDiscovery, URI } from "@p2m2/discovery";

describe("-- GITHUB ISSUES -- ", () => {

Expand Down Expand Up @@ -41,11 +41,9 @@ describe("-- GITHUB ISSUES -- ", () => {
.something("hello")
.isSubjectOf(URI("a"),"type")
.filter.contains("Business")
.console();
/* .select("type")
.commit()
.raw();
.console()
.getSerializedString();

console.log("results:"+JSON.stringify(results))*/
console.log("results:"+JSON.stringify(results))
})
});
2 changes: 1 addition & 1 deletion ts/tests/swconfigurationbuilder.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SWDiscoveryConfiguration , SWDiscovery , URI } from "../../js/target/scala-2.13/scalajs-bundler/main/discovery-fastopt";
import { SWDiscoveryConfiguration , SWDiscovery , URI } from "@p2m2/discovery";

describe("SWDiscovery", () => {

Expand Down
8 changes: 4 additions & 4 deletions ts/tests/swdiscovery.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SWDiscoveryConfiguration , SWDiscovery } from "../../js/target/scala-2.13/scalajs-bundler/main/discovery-fastopt";
import { SWDiscoveryConfiguration , SWDiscovery } from "@p2m2/discovery";

describe("SWDiscovery", () => {

Expand Down Expand Up @@ -51,7 +51,7 @@ describe("SWDiscovery", () => {
test("selectByPage", async () => {
const args =
await SWDiscovery(localConf)
.something("h1").selectByPage(["h1"]);
.something("h1").selectByPage("h1");

let numberOfPages : Number = Object.values(args)[0] as Number ;
let lazyPage : Array<any> = Object.values(args)[1] as Array<any> ;
Expand All @@ -69,10 +69,10 @@ describe("SWDiscovery", () => {
})

test("browse", () => {
const results = SWDiscovery(localConf)
const results : string[] = SWDiscovery(localConf)
.something("h1")
.isObjectOf("http://test11")
.browse( ( n: any, p : Number) => {
.browse( ( n: any, p : Number) : string => {
return n.$type + " : " + p;
});
expect(results).toStrictEqual([
Expand Down
2 changes: 1 addition & 1 deletion ts/tests/swtransaction.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SWDiscoveryConfiguration , SWDiscovery } from "../../js/target/scala-2.13/scalajs-bundler/main/discovery-fastopt"
import { SWDiscoveryConfiguration , SWDiscovery } from "@p2m2/discovery"

describe("SWDiscovery", () => {

Expand Down
136 changes: 136 additions & 0 deletions ts/types/discovery.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
export class SWDiscoveryConfiguration {
static setConfigString(confjson:string) : SWDiscoveryConfiguration
static init() : SWDiscoveryConfiguration

setPageSize(n: number) : SWDiscoveryConfiguration

setSizeBatchProcessing(n: number) : SWDiscoveryConfiguration

setLogLevel(level: string) : SWDiscoveryConfiguration

setCache(flag: boolean) : SWDiscoveryConfiguration

proxy(urlProxy : string , method? : string) : SWDiscoveryConfiguration

urlFile(
filename:string,
mimetype?:string,
method?:string,
auth?:string,
login?:string,
password?:string,
token?:string) : SWDiscoveryConfiguration

sparqlEndpoint(
url : string,
method?:string,
auth?:string,
login?:string,
password?:string,
token?:string) : SWDiscoveryConfiguration

localFile(filename : string ,mimetype? : string) : SWDiscoveryConfiguration

rdfContent(content : string ,mimetype? : string) : SWDiscoveryConfiguration

sourcesSize : number
pageSize : number
sizeBatchProcessing : number
logLevel : string
cache : boolean

}

export class FilterIncrement {
isLiteral : SWDiscovery
isUri : SWDiscovery
isBlank : SWDiscovery
regex(pattern:string, flags?:string) : SWDiscovery
contains(pattern:string) : SWDiscovery
strStarts(pattern:string) : SWDiscovery
strEnds(pattern:string) : SWDiscovery
}

export class SWTransaction {
progression(callBack : (percent: number) => any ) : SWTransaction
requestEvent(callBack : (event: string) => any ) : SWTransaction
abort() : SWTransaction
commit() : SWTransaction
raw() : Promise<any>
distinct() : SWTransaction
limit(l:number) : SWTransaction
offset(l:number) : SWTransaction
orderByAsc(...ref:string[]) : SWTransaction
orderByDesc(...ref:string[]) : SWTransaction
getSerializedString() : string
setSerializedString(serialized_transaction:string) : SWTransaction
console() : SWTransaction
}

export function SWDiscovery(config?:SWDiscoveryConfiguration) : SWDiscovery

export class SWDiscovery {

setConfig(config:SWDiscoveryConfiguration) : SWDiscovery
getConfig() : SWDiscoveryConfiguration

filter : FilterIncrement
root() : SWDiscovery

prefix(short: string,long : URI | IRI | string) : SWDiscovery
directive(diretive: string) : SWDiscovery
prefix(directive: URI | IRI | string) : SWDiscovery

something(ref: string): SWDiscovery
isSubjectOf(uri: URI | IRI | string, ref?: string): SWDiscovery
isObjectOf(uri: URI | IRI | string, ref?: string): SWDiscovery
isLinkTo(uri: URI | IRI | string, ref?: string): SWDiscovery
isLinkFrom(uri: URI | IRI | string, ref?: string): SWDiscovery
isA(uri: URI | IRI | string): SWDiscovery


set(uri: URI | IRI | string) : SWDiscovery
setList(uris: (URI | IRI | string)[]) : SWDiscovery
datatype(uri: URI | IRI | string, ref: string): SWDiscovery

bind(ref: string) : SWDiscovery
helper() : SWDiscovery
console(): SWDiscovery
focus() : string
focus(ref: string) : SWDiscovery
remove(focus: string) : SWDiscovery
sparql() : string

select( ...lRef:string[] ) : SWTransaction
selectByPage( ...lRef:string[] ) : Promise<[number,(SWTransaction[])]>
selectDistinctByPage( ...lRef:string[] ) : Promise<[number,(SWTransaction[])]>

setSerializedString(serializedDiscovery:string) : SWDiscovery
getSerializedString() : string

setDecoration(key : string, value : string) : SWDiscovery
getDecoration(key : string) : string
browse<Type>( fun : (n: any, p : Number) => Type ) : Type[]


}

/**
* RDF type definition
*/

export interface IRI {}
export function IRI(iri : String) : IRI
export interface URI {}
export function URI(iri : String) : URI
export interface Anonymous {}
export function Anonymous(iri : String) : Anonymous
export interface PropertyPath {}
export function PropertyPath(value : String) : PropertyPath
export interface Literal {}
export function Literal(value : String, datatype?: URI|string) : Literal
export function Literal(value : number) : Literal
export function Literal(value : boolean) : Literal
export interface QueryVariable {}
export function QueryVariable(name : string) : QueryVariable

8 changes: 6 additions & 2 deletions update_cdn_libjs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
export NODE_OPTIONS=--openssl-legacy-provider

# clean dist directory
rm dist/discovery*.js
rm -f dist/discovery*.js
# generate build version
rm ./shared/src/main/scala/inrae/semantic_web/SWDiscoveryVersionAtBuildTime.scala
rm -f ./shared/src/main/scala/inrae/semantic_web/SWDiscoveryVersionAtBuildTime.scala

# browser lib debug information
sbt discoveryJS/fastOptJS/webpack
Expand All @@ -22,6 +22,10 @@ cp ./js/target/scala-2.13/scalajs-bundler/main/discovery-opt-bundle.js ./dist/di
# typescript test
sbt npmPackageJson
npm i
npm link
cd ts
npm link @p2m2/discovery
cd ..
npm test -- --silent && echo "typescript test ok" || exit 1

sed -i "s#discovery-fastopt-bundle#discovery-web-dev#g" $(find ./dist -type f -name "*dev*")
Expand Down

0 comments on commit f8b3da7

Please sign in to comment.