From 346e1a1de48230d680baf9e50971066fd1c86e72 Mon Sep 17 00:00:00 2001 From: Jackson Morgan Date: Tue, 16 Jul 2024 23:40:51 -0400 Subject: [PATCH 01/10] Fix for multiple removed items cluttering a transaction --- packages/solid/test/Integration.test.ts | 2 +- .../src/mergeDatasetChanges.ts | 2 ++ .../test/TransactionalDataset.test.ts | 22 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/packages/solid/test/Integration.test.ts b/packages/solid/test/Integration.test.ts index 4d97db8..2c41548 100644 --- a/packages/solid/test/Integration.test.ts +++ b/packages/solid/test/Integration.test.ts @@ -688,7 +688,7 @@ describe("Integration", () => { expect(realResult.storageContainers[0].uri).toBe( "https://example.com/A/", ); - expect(realResult.storageContainers[0].uri).toBe( + expect(realResult.storageContainers[1].uri).toBe( "https://example.com/B/", ); }); diff --git a/packages/subscribable-dataset/src/mergeDatasetChanges.ts b/packages/subscribable-dataset/src/mergeDatasetChanges.ts index f62cade..2904a3a 100644 --- a/packages/subscribable-dataset/src/mergeDatasetChanges.ts +++ b/packages/subscribable-dataset/src/mergeDatasetChanges.ts @@ -40,6 +40,8 @@ export function mergeDatasetChanges( if (changesIntersection && changesIntersection.size > 0) { originalChange.added = originalChange.added?.difference(changesIntersection); + originalChange.removed = + originalChange.removed.difference(changesIntersection); } } diff --git a/packages/subscribable-dataset/test/TransactionalDataset.test.ts b/packages/subscribable-dataset/test/TransactionalDataset.test.ts index 903feef..f1741e6 100644 --- a/packages/subscribable-dataset/test/TransactionalDataset.test.ts +++ b/packages/subscribable-dataset/test/TransactionalDataset.test.ts @@ -358,4 +358,26 @@ describe("TransactionDataset", () => { expect(datasetChanges.added?.size).toBe(1); expect(datasetChanges.removed).toBe(undefined); }); + + it("removes added triples from changes instead of simply adding them", () => { + transactionalDataset.delete(tomNameQuad); + const nameQuad2 = quad( + namedNode("http://example.org/cartoons#Tom"), + namedNode("http://example.org/cartoons#name"), + literal("Toma"), + ); + transactionalDataset.add(nameQuad2); + transactionalDataset.delete(nameQuad2); + const nameQuad3 = quad( + namedNode("http://example.org/cartoons#Tom"), + namedNode("http://example.org/cartoons#name"), + literal("Tomas"), + ); + transactionalDataset.add(nameQuad3); + const datasetChanges = transactionalDataset.getChanges(); + expect(datasetChanges.added?.size).toBe(1); + expect(datasetChanges.added?.toArray()[0].object.value).toBe("Tomas"); + expect(datasetChanges.removed?.size).toBe(1); + expect(datasetChanges.removed?.toArray()[0].object.value).toBe("Tom"); + }); }); From 9dd31c4c57d79d459c4296b9edfdaa96bca10cfd Mon Sep 17 00:00:00 2001 From: Jackson Morgan Date: Tue, 16 Jul 2024 23:42:00 -0400 Subject: [PATCH 02/10] v0.0.1-alpha.25 --- lerna.json | 2 +- package-lock.json | 58 +++++++++++----------- packages/cli/package.json | 2 +- packages/demo-react/package.json | 6 +-- packages/jsonld-dataset-proxy/package.json | 4 +- packages/ldo/package.json | 6 +-- packages/solid-react/package.json | 10 ++-- packages/solid/package.json | 6 +-- packages/subscribable-dataset/package.json | 2 +- 9 files changed, 48 insertions(+), 48 deletions(-) diff --git a/lerna.json b/lerna.json index 02c81cc..e973810 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.0.1-alpha.24" + "version": "0.0.1-alpha.25" } diff --git a/package-lock.json b/package-lock.json index d967fb3..a7104a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31449,7 +31449,7 @@ }, "packages/cli": { "name": "@ldo/cli", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@ldo/schema-converter-shex": "^0.0.1-alpha.24", @@ -31696,10 +31696,10 @@ }, "packages/demo-react": { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.24", + "@ldo/solid-react": "^0.0.1-alpha.25", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -31708,7 +31708,7 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", @@ -31896,11 +31896,11 @@ }, "packages/jsonld-dataset-proxy": { "name": "@ldo/jsonld-dataset-proxy", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/dataset": "^1.1.0", "jsonld2graphobject": "^0.0.4" @@ -31976,12 +31976,12 @@ }, "packages/ldo": { "name": "@ldo/ldo", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "buffer": "^6.0.3", "readable-stream": "^4.3.0" @@ -32277,18 +32277,18 @@ }, "packages/solid": { "name": "@ldo/solid", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.25", "@ldo/rdf-utils": "^0.0.1-alpha.24", "cross-fetch": "^3.1.6", "http-link-header": "^1.1.1" }, "devDependencies": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid/community-server": "^6.0.2", @@ -32304,15 +32304,15 @@ }, "packages/solid-react": { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/solid": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" }, @@ -32441,7 +32441,7 @@ }, "packages/subscribable-dataset": { "name": "@ldo/subscribable-dataset", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", @@ -38220,8 +38220,8 @@ "requires": { "@craco/craco": "^7.1.0", "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/cli": "^0.0.1-alpha.24", - "@ldo/solid-react": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/solid-react": "^0.0.1-alpha.25", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", @@ -38364,7 +38364,7 @@ "version": "file:packages/jsonld-dataset-proxy", "requires": { "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/dataset": "^1.1.0", "@rdfjs/types": "^1.1.0", @@ -38406,9 +38406,9 @@ "version": "file:packages/ldo", "requires": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@types/jest": "^27.0.3", @@ -38561,9 +38561,9 @@ "version": "file:packages/solid", "requires": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.25", "@ldo/rdf-utils": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", @@ -38606,11 +38606,11 @@ "requires": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.25", "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/solid": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@testing-library/react": "^14.1.2", diff --git a/packages/cli/package.json b/packages/cli/package.json index 77e08a8..bf5dd2e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/cli", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "A Command Line Interface for Linked Data Objects", "main": "./dist/index.js", "bin": { diff --git a/packages/demo-react/package.json b/packages/demo-react/package.json index 1a63ed7..9f804d9 100644 --- a/packages/demo-react/package.json +++ b/packages/demo-react/package.json @@ -1,9 +1,9 @@ { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.24", + "@ldo/solid-react": "^0.0.1-alpha.25", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -37,7 +37,7 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", diff --git a/packages/jsonld-dataset-proxy/package.json b/packages/jsonld-dataset-proxy/package.json index c7e3129..3d95878 100644 --- a/packages/jsonld-dataset-proxy/package.json +++ b/packages/jsonld-dataset-proxy/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/jsonld-dataset-proxy", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "", "main": "dist/index.js", "scripts": { @@ -41,7 +41,7 @@ ], "dependencies": { "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/dataset": "^1.1.0", "jsonld2graphobject": "^0.0.4" diff --git a/packages/ldo/package.json b/packages/ldo/package.json index c7dc0ef..3557fa0 100644 --- a/packages/ldo/package.json +++ b/packages/ldo/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/ldo", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "", "main": "dist/index.js", "scripts": { @@ -39,8 +39,8 @@ }, "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "buffer": "^6.0.3", "readable-stream": "^4.3.0" diff --git a/packages/solid-react/package.json b/packages/solid-react/package.json index d3e0fb4..c11db29 100644 --- a/packages/solid-react/package.json +++ b/packages/solid-react/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "A React library for LDO and Solid", "main": "dist/index.js", "scripts": { @@ -38,10 +38,10 @@ "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/solid": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" }, diff --git a/packages/solid/package.json b/packages/solid/package.json index 87c84e4..f3c2e09 100644 --- a/packages/solid/package.json +++ b/packages/solid/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "A library for LDO and Solid", "main": "dist/index.js", "scripts": { @@ -26,7 +26,7 @@ "homepage": "https://github.com/o-development/ldobjects/tree/main/packages/solid#readme", "devDependencies": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid/community-server": "^6.0.2", @@ -41,7 +41,7 @@ }, "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.25", "@ldo/rdf-utils": "^0.0.1-alpha.24", "cross-fetch": "^3.1.6", "http-link-header": "^1.1.1" diff --git a/packages/subscribable-dataset/package.json b/packages/subscribable-dataset/package.json index 566ff65..fa4af30 100644 --- a/packages/subscribable-dataset/package.json +++ b/packages/subscribable-dataset/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/subscribable-dataset", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "An RDFJS dataset implementation that can be subscribed to for updates", "main": "dist/index.js", "scripts": { From 660e2be743ae1db8b79c80610a021e6759ce1fa6 Mon Sep 17 00:00:00 2001 From: Jackson Morgan Date: Tue, 16 Jul 2024 23:58:32 -0400 Subject: [PATCH 03/10] Unknown changes --- lerna.json | 2 +- package-lock.json | 58 +++++++++---------- packages/cli/package.json | 2 +- packages/demo-react/package.json | 6 +- packages/jsonld-dataset-proxy/package.json | 4 +- packages/ldo/package.json | 6 +- packages/solid-react/package.json | 10 ++-- packages/solid/package.json | 6 +- packages/solid/test/Integration.test.ts | 2 +- packages/subscribable-dataset/package.json | 2 +- .../src/mergeDatasetChanges.ts | 2 - .../test/TransactionalDataset.test.ts | 22 ------- 12 files changed, 49 insertions(+), 73 deletions(-) diff --git a/lerna.json b/lerna.json index e973810..02c81cc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.0.1-alpha.25" + "version": "0.0.1-alpha.24" } diff --git a/package-lock.json b/package-lock.json index a7104a0..d967fb3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31449,7 +31449,7 @@ }, "packages/cli": { "name": "@ldo/cli", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "license": "MIT", "dependencies": { "@ldo/schema-converter-shex": "^0.0.1-alpha.24", @@ -31696,10 +31696,10 @@ }, "packages/demo-react": { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.25", + "@ldo/solid-react": "^0.0.1-alpha.24", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -31708,7 +31708,7 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.24", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", @@ -31896,11 +31896,11 @@ }, "packages/jsonld-dataset-proxy": { "name": "@ldo/jsonld-dataset-proxy", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "license": "MIT", "dependencies": { "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/dataset": "^1.1.0", "jsonld2graphobject": "^0.0.4" @@ -31976,12 +31976,12 @@ }, "packages/ldo": { "name": "@ldo/ldo", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "buffer": "^6.0.3", "readable-stream": "^4.3.0" @@ -32277,18 +32277,18 @@ }, "packages/solid": { "name": "@ldo/solid", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.24", "@ldo/rdf-utils": "^0.0.1-alpha.24", "cross-fetch": "^3.1.6", "http-link-header": "^1.1.1" }, "devDependencies": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid/community-server": "^6.0.2", @@ -32304,15 +32304,15 @@ }, "packages/solid-react": { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "license": "MIT", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", - "@ldo/ldo": "^0.0.1-alpha.25", - "@ldo/solid": "^0.0.1-alpha.25", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/solid": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" }, @@ -32441,7 +32441,7 @@ }, "packages/subscribable-dataset": { "name": "@ldo/subscribable-dataset", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", @@ -38220,8 +38220,8 @@ "requires": { "@craco/craco": "^7.1.0", "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/cli": "^0.0.1-alpha.25", - "@ldo/solid-react": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/solid-react": "^0.0.1-alpha.24", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", @@ -38364,7 +38364,7 @@ "version": "file:packages/jsonld-dataset-proxy", "requires": { "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/dataset": "^1.1.0", "@rdfjs/types": "^1.1.0", @@ -38406,9 +38406,9 @@ "version": "file:packages/ldo", "requires": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@types/jest": "^27.0.3", @@ -38561,9 +38561,9 @@ "version": "file:packages/solid", "requires": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.24", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.24", "@ldo/rdf-utils": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", @@ -38606,11 +38606,11 @@ "requires": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", - "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.24", "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.25", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/solid": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@testing-library/react": "^14.1.2", diff --git a/packages/cli/package.json b/packages/cli/package.json index bf5dd2e..77e08a8 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/cli", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "description": "A Command Line Interface for Linked Data Objects", "main": "./dist/index.js", "bin": { diff --git a/packages/demo-react/package.json b/packages/demo-react/package.json index 9f804d9..1a63ed7 100644 --- a/packages/demo-react/package.json +++ b/packages/demo-react/package.json @@ -1,9 +1,9 @@ { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.25", + "@ldo/solid-react": "^0.0.1-alpha.24", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -37,7 +37,7 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.24", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", diff --git a/packages/jsonld-dataset-proxy/package.json b/packages/jsonld-dataset-proxy/package.json index 3d95878..c7e3129 100644 --- a/packages/jsonld-dataset-proxy/package.json +++ b/packages/jsonld-dataset-proxy/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/jsonld-dataset-proxy", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "description": "", "main": "dist/index.js", "scripts": { @@ -41,7 +41,7 @@ ], "dependencies": { "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/dataset": "^1.1.0", "jsonld2graphobject": "^0.0.4" diff --git a/packages/ldo/package.json b/packages/ldo/package.json index 3557fa0..c7dc0ef 100644 --- a/packages/ldo/package.json +++ b/packages/ldo/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/ldo", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "description": "", "main": "dist/index.js", "scripts": { @@ -39,8 +39,8 @@ }, "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "buffer": "^6.0.3", "readable-stream": "^4.3.0" diff --git a/packages/solid-react/package.json b/packages/solid-react/package.json index c11db29..d3e0fb4 100644 --- a/packages/solid-react/package.json +++ b/packages/solid-react/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "description": "A React library for LDO and Solid", "main": "dist/index.js", "scripts": { @@ -38,10 +38,10 @@ "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", - "@ldo/ldo": "^0.0.1-alpha.25", - "@ldo/solid": "^0.0.1-alpha.25", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/solid": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" }, diff --git a/packages/solid/package.json b/packages/solid/package.json index f3c2e09..87c84e4 100644 --- a/packages/solid/package.json +++ b/packages/solid/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "description": "A library for LDO and Solid", "main": "dist/index.js", "scripts": { @@ -26,7 +26,7 @@ "homepage": "https://github.com/o-development/ldobjects/tree/main/packages/solid#readme", "devDependencies": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid/community-server": "^6.0.2", @@ -41,7 +41,7 @@ }, "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.24", "@ldo/rdf-utils": "^0.0.1-alpha.24", "cross-fetch": "^3.1.6", "http-link-header": "^1.1.1" diff --git a/packages/solid/test/Integration.test.ts b/packages/solid/test/Integration.test.ts index 2c41548..4d97db8 100644 --- a/packages/solid/test/Integration.test.ts +++ b/packages/solid/test/Integration.test.ts @@ -688,7 +688,7 @@ describe("Integration", () => { expect(realResult.storageContainers[0].uri).toBe( "https://example.com/A/", ); - expect(realResult.storageContainers[1].uri).toBe( + expect(realResult.storageContainers[0].uri).toBe( "https://example.com/B/", ); }); diff --git a/packages/subscribable-dataset/package.json b/packages/subscribable-dataset/package.json index fa4af30..566ff65 100644 --- a/packages/subscribable-dataset/package.json +++ b/packages/subscribable-dataset/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/subscribable-dataset", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "description": "An RDFJS dataset implementation that can be subscribed to for updates", "main": "dist/index.js", "scripts": { diff --git a/packages/subscribable-dataset/src/mergeDatasetChanges.ts b/packages/subscribable-dataset/src/mergeDatasetChanges.ts index 2904a3a..f62cade 100644 --- a/packages/subscribable-dataset/src/mergeDatasetChanges.ts +++ b/packages/subscribable-dataset/src/mergeDatasetChanges.ts @@ -40,8 +40,6 @@ export function mergeDatasetChanges( if (changesIntersection && changesIntersection.size > 0) { originalChange.added = originalChange.added?.difference(changesIntersection); - originalChange.removed = - originalChange.removed.difference(changesIntersection); } } diff --git a/packages/subscribable-dataset/test/TransactionalDataset.test.ts b/packages/subscribable-dataset/test/TransactionalDataset.test.ts index f1741e6..903feef 100644 --- a/packages/subscribable-dataset/test/TransactionalDataset.test.ts +++ b/packages/subscribable-dataset/test/TransactionalDataset.test.ts @@ -358,26 +358,4 @@ describe("TransactionDataset", () => { expect(datasetChanges.added?.size).toBe(1); expect(datasetChanges.removed).toBe(undefined); }); - - it("removes added triples from changes instead of simply adding them", () => { - transactionalDataset.delete(tomNameQuad); - const nameQuad2 = quad( - namedNode("http://example.org/cartoons#Tom"), - namedNode("http://example.org/cartoons#name"), - literal("Toma"), - ); - transactionalDataset.add(nameQuad2); - transactionalDataset.delete(nameQuad2); - const nameQuad3 = quad( - namedNode("http://example.org/cartoons#Tom"), - namedNode("http://example.org/cartoons#name"), - literal("Tomas"), - ); - transactionalDataset.add(nameQuad3); - const datasetChanges = transactionalDataset.getChanges(); - expect(datasetChanges.added?.size).toBe(1); - expect(datasetChanges.added?.toArray()[0].object.value).toBe("Tomas"); - expect(datasetChanges.removed?.size).toBe(1); - expect(datasetChanges.removed?.toArray()[0].object.value).toBe("Tom"); - }); }); From 0fb3c04fee87e533b120a5b45599c12c2c8a5e6f Mon Sep 17 00:00:00 2001 From: Jackson Morgan Date: Tue, 16 Jul 2024 23:59:49 -0400 Subject: [PATCH 04/10] v0.0.1-alpha.25 --- lerna.json | 2 +- package-lock.json | 58 +++++++++++----------- packages/cli/package.json | 2 +- packages/demo-react/package.json | 6 +-- packages/jsonld-dataset-proxy/package.json | 4 +- packages/ldo/package.json | 6 +-- packages/solid-react/package.json | 10 ++-- packages/solid/package.json | 6 +-- packages/subscribable-dataset/package.json | 2 +- 9 files changed, 48 insertions(+), 48 deletions(-) diff --git a/lerna.json b/lerna.json index 02c81cc..e973810 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.0.1-alpha.24" + "version": "0.0.1-alpha.25" } diff --git a/package-lock.json b/package-lock.json index d967fb3..a7104a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31449,7 +31449,7 @@ }, "packages/cli": { "name": "@ldo/cli", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@ldo/schema-converter-shex": "^0.0.1-alpha.24", @@ -31696,10 +31696,10 @@ }, "packages/demo-react": { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.24", + "@ldo/solid-react": "^0.0.1-alpha.25", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -31708,7 +31708,7 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", @@ -31896,11 +31896,11 @@ }, "packages/jsonld-dataset-proxy": { "name": "@ldo/jsonld-dataset-proxy", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/dataset": "^1.1.0", "jsonld2graphobject": "^0.0.4" @@ -31976,12 +31976,12 @@ }, "packages/ldo": { "name": "@ldo/ldo", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "buffer": "^6.0.3", "readable-stream": "^4.3.0" @@ -32277,18 +32277,18 @@ }, "packages/solid": { "name": "@ldo/solid", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.25", "@ldo/rdf-utils": "^0.0.1-alpha.24", "cross-fetch": "^3.1.6", "http-link-header": "^1.1.1" }, "devDependencies": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid/community-server": "^6.0.2", @@ -32304,15 +32304,15 @@ }, "packages/solid-react": { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/solid": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" }, @@ -32441,7 +32441,7 @@ }, "packages/subscribable-dataset": { "name": "@ldo/subscribable-dataset", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", @@ -38220,8 +38220,8 @@ "requires": { "@craco/craco": "^7.1.0", "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/cli": "^0.0.1-alpha.24", - "@ldo/solid-react": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/solid-react": "^0.0.1-alpha.25", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", @@ -38364,7 +38364,7 @@ "version": "file:packages/jsonld-dataset-proxy", "requires": { "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/dataset": "^1.1.0", "@rdfjs/types": "^1.1.0", @@ -38406,9 +38406,9 @@ "version": "file:packages/ldo", "requires": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@types/jest": "^27.0.3", @@ -38561,9 +38561,9 @@ "version": "file:packages/solid", "requires": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.25", "@ldo/rdf-utils": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", @@ -38606,11 +38606,11 @@ "requires": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.25", "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/solid": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@testing-library/react": "^14.1.2", diff --git a/packages/cli/package.json b/packages/cli/package.json index 77e08a8..bf5dd2e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/cli", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "A Command Line Interface for Linked Data Objects", "main": "./dist/index.js", "bin": { diff --git a/packages/demo-react/package.json b/packages/demo-react/package.json index 1a63ed7..9f804d9 100644 --- a/packages/demo-react/package.json +++ b/packages/demo-react/package.json @@ -1,9 +1,9 @@ { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.24", + "@ldo/solid-react": "^0.0.1-alpha.25", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -37,7 +37,7 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", diff --git a/packages/jsonld-dataset-proxy/package.json b/packages/jsonld-dataset-proxy/package.json index c7e3129..3d95878 100644 --- a/packages/jsonld-dataset-proxy/package.json +++ b/packages/jsonld-dataset-proxy/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/jsonld-dataset-proxy", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "", "main": "dist/index.js", "scripts": { @@ -41,7 +41,7 @@ ], "dependencies": { "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/dataset": "^1.1.0", "jsonld2graphobject": "^0.0.4" diff --git a/packages/ldo/package.json b/packages/ldo/package.json index c7dc0ef..3557fa0 100644 --- a/packages/ldo/package.json +++ b/packages/ldo/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/ldo", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "", "main": "dist/index.js", "scripts": { @@ -39,8 +39,8 @@ }, "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "buffer": "^6.0.3", "readable-stream": "^4.3.0" diff --git a/packages/solid-react/package.json b/packages/solid-react/package.json index d3e0fb4..c11db29 100644 --- a/packages/solid-react/package.json +++ b/packages/solid-react/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "A React library for LDO and Solid", "main": "dist/index.js", "scripts": { @@ -38,10 +38,10 @@ "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.24", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/solid": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" }, diff --git a/packages/solid/package.json b/packages/solid/package.json index 87c84e4..f3c2e09 100644 --- a/packages/solid/package.json +++ b/packages/solid/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "A library for LDO and Solid", "main": "dist/index.js", "scripts": { @@ -26,7 +26,7 @@ "homepage": "https://github.com/o-development/ldobjects/tree/main/packages/solid#readme", "devDependencies": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid/community-server": "^6.0.2", @@ -41,7 +41,7 @@ }, "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.25", "@ldo/rdf-utils": "^0.0.1-alpha.24", "cross-fetch": "^3.1.6", "http-link-header": "^1.1.1" diff --git a/packages/subscribable-dataset/package.json b/packages/subscribable-dataset/package.json index 566ff65..fa4af30 100644 --- a/packages/subscribable-dataset/package.json +++ b/packages/subscribable-dataset/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/subscribable-dataset", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "An RDFJS dataset implementation that can be subscribed to for updates", "main": "dist/index.js", "scripts": { From 5e8cf2fc98233982e4d5de1f828e2a696fd3d69d Mon Sep 17 00:00:00 2001 From: Jackson Morgan Date: Wed, 17 Jul 2024 00:03:53 -0400 Subject: [PATCH 05/10] More unknown changes --- lerna.json | 2 +- package-lock.json | 58 +++++++++++----------- packages/cli/package.json | 2 +- packages/demo-react/package.json | 6 +-- packages/jsonld-dataset-proxy/package.json | 4 +- packages/ldo/package.json | 6 +-- packages/solid-react/package.json | 10 ++-- packages/solid/package.json | 6 +-- packages/subscribable-dataset/package.json | 2 +- 9 files changed, 48 insertions(+), 48 deletions(-) diff --git a/lerna.json b/lerna.json index e973810..02c81cc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.0.1-alpha.25" + "version": "0.0.1-alpha.24" } diff --git a/package-lock.json b/package-lock.json index a7104a0..d967fb3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31449,7 +31449,7 @@ }, "packages/cli": { "name": "@ldo/cli", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "license": "MIT", "dependencies": { "@ldo/schema-converter-shex": "^0.0.1-alpha.24", @@ -31696,10 +31696,10 @@ }, "packages/demo-react": { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.25", + "@ldo/solid-react": "^0.0.1-alpha.24", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -31708,7 +31708,7 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.24", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", @@ -31896,11 +31896,11 @@ }, "packages/jsonld-dataset-proxy": { "name": "@ldo/jsonld-dataset-proxy", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "license": "MIT", "dependencies": { "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/dataset": "^1.1.0", "jsonld2graphobject": "^0.0.4" @@ -31976,12 +31976,12 @@ }, "packages/ldo": { "name": "@ldo/ldo", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "buffer": "^6.0.3", "readable-stream": "^4.3.0" @@ -32277,18 +32277,18 @@ }, "packages/solid": { "name": "@ldo/solid", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.24", "@ldo/rdf-utils": "^0.0.1-alpha.24", "cross-fetch": "^3.1.6", "http-link-header": "^1.1.1" }, "devDependencies": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid/community-server": "^6.0.2", @@ -32304,15 +32304,15 @@ }, "packages/solid-react": { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "license": "MIT", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", - "@ldo/ldo": "^0.0.1-alpha.25", - "@ldo/solid": "^0.0.1-alpha.25", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/solid": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" }, @@ -32441,7 +32441,7 @@ }, "packages/subscribable-dataset": { "name": "@ldo/subscribable-dataset", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", @@ -38220,8 +38220,8 @@ "requires": { "@craco/craco": "^7.1.0", "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/cli": "^0.0.1-alpha.25", - "@ldo/solid-react": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/solid-react": "^0.0.1-alpha.24", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", @@ -38364,7 +38364,7 @@ "version": "file:packages/jsonld-dataset-proxy", "requires": { "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/dataset": "^1.1.0", "@rdfjs/types": "^1.1.0", @@ -38406,9 +38406,9 @@ "version": "file:packages/ldo", "requires": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@types/jest": "^27.0.3", @@ -38561,9 +38561,9 @@ "version": "file:packages/solid", "requires": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.24", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.24", "@ldo/rdf-utils": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", @@ -38606,11 +38606,11 @@ "requires": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", - "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.24", "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.25", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/solid": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@testing-library/react": "^14.1.2", diff --git a/packages/cli/package.json b/packages/cli/package.json index bf5dd2e..77e08a8 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/cli", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "description": "A Command Line Interface for Linked Data Objects", "main": "./dist/index.js", "bin": { diff --git a/packages/demo-react/package.json b/packages/demo-react/package.json index 9f804d9..1a63ed7 100644 --- a/packages/demo-react/package.json +++ b/packages/demo-react/package.json @@ -1,9 +1,9 @@ { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.25", + "@ldo/solid-react": "^0.0.1-alpha.24", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -37,7 +37,7 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.24", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", diff --git a/packages/jsonld-dataset-proxy/package.json b/packages/jsonld-dataset-proxy/package.json index 3d95878..c7e3129 100644 --- a/packages/jsonld-dataset-proxy/package.json +++ b/packages/jsonld-dataset-proxy/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/jsonld-dataset-proxy", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "description": "", "main": "dist/index.js", "scripts": { @@ -41,7 +41,7 @@ ], "dependencies": { "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/dataset": "^1.1.0", "jsonld2graphobject": "^0.0.4" diff --git a/packages/ldo/package.json b/packages/ldo/package.json index 3557fa0..c7dc0ef 100644 --- a/packages/ldo/package.json +++ b/packages/ldo/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/ldo", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "description": "", "main": "dist/index.js", "scripts": { @@ -39,8 +39,8 @@ }, "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "buffer": "^6.0.3", "readable-stream": "^4.3.0" diff --git a/packages/solid-react/package.json b/packages/solid-react/package.json index c11db29..d3e0fb4 100644 --- a/packages/solid-react/package.json +++ b/packages/solid-react/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "description": "A React library for LDO and Solid", "main": "dist/index.js", "scripts": { @@ -38,10 +38,10 @@ "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.25", - "@ldo/ldo": "^0.0.1-alpha.25", - "@ldo/solid": "^0.0.1-alpha.25", - "@ldo/subscribable-dataset": "^0.0.1-alpha.25", + "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/solid": "^0.0.1-alpha.24", + "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" }, diff --git a/packages/solid/package.json b/packages/solid/package.json index f3c2e09..87c84e4 100644 --- a/packages/solid/package.json +++ b/packages/solid/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "description": "A library for LDO and Solid", "main": "dist/index.js", "scripts": { @@ -26,7 +26,7 @@ "homepage": "https://github.com/o-development/ldobjects/tree/main/packages/solid#readme", "devDependencies": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid/community-server": "^6.0.2", @@ -41,7 +41,7 @@ }, "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.24", "@ldo/rdf-utils": "^0.0.1-alpha.24", "cross-fetch": "^3.1.6", "http-link-header": "^1.1.1" diff --git a/packages/subscribable-dataset/package.json b/packages/subscribable-dataset/package.json index fa4af30..566ff65 100644 --- a/packages/subscribable-dataset/package.json +++ b/packages/subscribable-dataset/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/subscribable-dataset", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.24", "description": "An RDFJS dataset implementation that can be subscribed to for updates", "main": "dist/index.js", "scripts": { From c63f055aab22155b60a5fdee4172979b9c287dfa Mon Sep 17 00:00:00 2001 From: Jackson Morgan Date: Wed, 17 Jul 2024 00:04:14 -0400 Subject: [PATCH 06/10] v0.0.1-alpha.25 --- lerna.json | 2 +- package-lock.json | 34 +++++++++++++++---------------- packages/cli/package.json | 2 +- packages/demo-react/package.json | 6 +++--- packages/ldo/package.json | 2 +- packages/solid-react/package.json | 6 +++--- packages/solid/package.json | 6 +++--- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lerna.json b/lerna.json index 02c81cc..e973810 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.0.1-alpha.24" + "version": "0.0.1-alpha.25" } diff --git a/package-lock.json b/package-lock.json index d967fb3..ca97acd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31449,7 +31449,7 @@ }, "packages/cli": { "name": "@ldo/cli", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@ldo/schema-converter-shex": "^0.0.1-alpha.24", @@ -31696,10 +31696,10 @@ }, "packages/demo-react": { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.24", + "@ldo/solid-react": "^0.0.1-alpha.25", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -31708,7 +31708,7 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", @@ -31976,7 +31976,7 @@ }, "packages/ldo": { "name": "@ldo/ldo", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", @@ -32277,18 +32277,18 @@ }, "packages/solid": { "name": "@ldo/solid", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.25", "@ldo/rdf-utils": "^0.0.1-alpha.24", "cross-fetch": "^3.1.6", "http-link-header": "^1.1.1" }, "devDependencies": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid/community-server": "^6.0.2", @@ -32304,14 +32304,14 @@ }, "packages/solid-react": { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "license": "MIT", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/solid": "^0.0.1-alpha.25", "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" @@ -38220,8 +38220,8 @@ "requires": { "@craco/craco": "^7.1.0", "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/cli": "^0.0.1-alpha.24", - "@ldo/solid-react": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/solid-react": "^0.0.1-alpha.25", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", @@ -38561,9 +38561,9 @@ "version": "file:packages/solid", "requires": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.25", "@ldo/rdf-utils": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", @@ -38607,9 +38607,9 @@ "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.25", "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.24", + "@ldo/solid": "^0.0.1-alpha.25", "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 77e08a8..bf5dd2e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/cli", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "A Command Line Interface for Linked Data Objects", "main": "./dist/index.js", "bin": { diff --git a/packages/demo-react/package.json b/packages/demo-react/package.json index 1a63ed7..9f804d9 100644 --- a/packages/demo-react/package.json +++ b/packages/demo-react/package.json @@ -1,9 +1,9 @@ { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.24", + "@ldo/solid-react": "^0.0.1-alpha.25", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -37,7 +37,7 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", diff --git a/packages/ldo/package.json b/packages/ldo/package.json index c7dc0ef..cc3a045 100644 --- a/packages/ldo/package.json +++ b/packages/ldo/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/ldo", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "", "main": "dist/index.js", "scripts": { diff --git a/packages/solid-react/package.json b/packages/solid-react/package.json index d3e0fb4..8d1fec1 100644 --- a/packages/solid-react/package.json +++ b/packages/solid-react/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "A React library for LDO and Solid", "main": "dist/index.js", "scripts": { @@ -39,8 +39,8 @@ "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/solid": "^0.0.1-alpha.25", "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" diff --git a/packages/solid/package.json b/packages/solid/package.json index 87c84e4..f3c2e09 100644 --- a/packages/solid/package.json +++ b/packages/solid/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.25", "description": "A library for LDO and Solid", "main": "dist/index.js", "scripts": { @@ -26,7 +26,7 @@ "homepage": "https://github.com/o-development/ldobjects/tree/main/packages/solid#readme", "devDependencies": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.25", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid/community-server": "^6.0.2", @@ -41,7 +41,7 @@ }, "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.25", "@ldo/rdf-utils": "^0.0.1-alpha.24", "cross-fetch": "^3.1.6", "http-link-header": "^1.1.1" From af68b1b1eef299d465cd5481d035479c505430b9 Mon Sep 17 00:00:00 2001 From: Jackson Morgan Date: Wed, 17 Jul 2024 00:06:08 -0400 Subject: [PATCH 07/10] Fixed Error test --- packages/cli/package.json | 2 +- packages/demo-react/package.json | 2 +- packages/ldo/package.json | 2 +- packages/solid-react/package.json | 2 +- packages/solid/package.json | 2 +- packages/solid/test/Integration.test.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index bf5dd2e..0fbd5d0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -60,5 +60,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "d2364cd2f8da5f0b673b1202d29df5b7c071a17c" + "gitHead": "c63f055aab22155b60a5fdee4172979b9c287dfa" } diff --git a/packages/demo-react/package.json b/packages/demo-react/package.json index 9f804d9..247dcff 100644 --- a/packages/demo-react/package.json +++ b/packages/demo-react/package.json @@ -43,7 +43,7 @@ "@types/shexj": "^2.1.4", "tsconfig-paths-webpack-plugin": "^4.1.0" }, - "gitHead": "4548985c0de9b0ec83cf5ee93f2d7c1ca2c1b8d8", + "gitHead": "c63f055aab22155b60a5fdee4172979b9c287dfa", "publishConfig": { "access": "public" } diff --git a/packages/ldo/package.json b/packages/ldo/package.json index cc3a045..bde0e02 100644 --- a/packages/ldo/package.json +++ b/packages/ldo/package.json @@ -55,5 +55,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "d2364cd2f8da5f0b673b1202d29df5b7c071a17c" + "gitHead": "c63f055aab22155b60a5fdee4172979b9c287dfa" } diff --git a/packages/solid-react/package.json b/packages/solid-react/package.json index 8d1fec1..f979090 100644 --- a/packages/solid-react/package.json +++ b/packages/solid-react/package.json @@ -52,5 +52,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "d2364cd2f8da5f0b673b1202d29df5b7c071a17c" + "gitHead": "c63f055aab22155b60a5fdee4172979b9c287dfa" } diff --git a/packages/solid/package.json b/packages/solid/package.json index f3c2e09..878340b 100644 --- a/packages/solid/package.json +++ b/packages/solid/package.json @@ -53,5 +53,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "d2364cd2f8da5f0b673b1202d29df5b7c071a17c" + "gitHead": "c63f055aab22155b60a5fdee4172979b9c287dfa" } diff --git a/packages/solid/test/Integration.test.ts b/packages/solid/test/Integration.test.ts index 4d97db8..2c41548 100644 --- a/packages/solid/test/Integration.test.ts +++ b/packages/solid/test/Integration.test.ts @@ -688,7 +688,7 @@ describe("Integration", () => { expect(realResult.storageContainers[0].uri).toBe( "https://example.com/A/", ); - expect(realResult.storageContainers[0].uri).toBe( + expect(realResult.storageContainers[1].uri).toBe( "https://example.com/B/", ); }); From 598755bbfc0681ad05a7093844bf699bfbe1311f Mon Sep 17 00:00:00 2001 From: Jackson Morgan Date: Wed, 17 Jul 2024 00:06:38 -0400 Subject: [PATCH 08/10] v0.0.1-alpha.26 --- lerna.json | 2 +- package-lock.json | 34 +++++++++++++++---------------- packages/cli/package.json | 2 +- packages/demo-react/package.json | 6 +++--- packages/ldo/package.json | 2 +- packages/solid-react/package.json | 6 +++--- packages/solid/package.json | 6 +++--- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lerna.json b/lerna.json index e973810..7c7b549 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.0.1-alpha.25" + "version": "0.0.1-alpha.26" } diff --git a/package-lock.json b/package-lock.json index ca97acd..63dc9c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31449,7 +31449,7 @@ }, "packages/cli": { "name": "@ldo/cli", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.26", "license": "MIT", "dependencies": { "@ldo/schema-converter-shex": "^0.0.1-alpha.24", @@ -31696,10 +31696,10 @@ }, "packages/demo-react": { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.26", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.25", + "@ldo/solid-react": "^0.0.1-alpha.26", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -31708,7 +31708,7 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.26", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", @@ -31976,7 +31976,7 @@ }, "packages/ldo": { "name": "@ldo/ldo", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.26", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", @@ -32277,18 +32277,18 @@ }, "packages/solid": { "name": "@ldo/solid", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.26", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.26", "@ldo/rdf-utils": "^0.0.1-alpha.24", "cross-fetch": "^3.1.6", "http-link-header": "^1.1.1" }, "devDependencies": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.26", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid/community-server": "^6.0.2", @@ -32304,14 +32304,14 @@ }, "packages/solid-react": { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.26", "license": "MIT", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.25", - "@ldo/solid": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.26", + "@ldo/solid": "^0.0.1-alpha.26", "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" @@ -38220,8 +38220,8 @@ "requires": { "@craco/craco": "^7.1.0", "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/cli": "^0.0.1-alpha.25", - "@ldo/solid-react": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.26", + "@ldo/solid-react": "^0.0.1-alpha.26", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", @@ -38561,9 +38561,9 @@ "version": "file:packages/solid", "requires": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.26", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.26", "@ldo/rdf-utils": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", @@ -38607,9 +38607,9 @@ "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.26", "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.25", + "@ldo/solid": "^0.0.1-alpha.26", "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 0fbd5d0..fa67a17 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/cli", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.26", "description": "A Command Line Interface for Linked Data Objects", "main": "./dist/index.js", "bin": { diff --git a/packages/demo-react/package.json b/packages/demo-react/package.json index 247dcff..6644662 100644 --- a/packages/demo-react/package.json +++ b/packages/demo-react/package.json @@ -1,9 +1,9 @@ { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.26", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.25", + "@ldo/solid-react": "^0.0.1-alpha.26", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -37,7 +37,7 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.26", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", diff --git a/packages/ldo/package.json b/packages/ldo/package.json index bde0e02..fd23b28 100644 --- a/packages/ldo/package.json +++ b/packages/ldo/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/ldo", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.26", "description": "", "main": "dist/index.js", "scripts": { diff --git a/packages/solid-react/package.json b/packages/solid-react/package.json index f979090..8453eff 100644 --- a/packages/solid-react/package.json +++ b/packages/solid-react/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.26", "description": "A React library for LDO and Solid", "main": "dist/index.js", "scripts": { @@ -39,8 +39,8 @@ "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.25", - "@ldo/solid": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.26", + "@ldo/solid": "^0.0.1-alpha.26", "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" diff --git a/packages/solid/package.json b/packages/solid/package.json index 878340b..0fa49b0 100644 --- a/packages/solid/package.json +++ b/packages/solid/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid", - "version": "0.0.1-alpha.25", + "version": "0.0.1-alpha.26", "description": "A library for LDO and Solid", "main": "dist/index.js", "scripts": { @@ -26,7 +26,7 @@ "homepage": "https://github.com/o-development/ldobjects/tree/main/packages/solid#readme", "devDependencies": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.25", + "@ldo/cli": "^0.0.1-alpha.26", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid/community-server": "^6.0.2", @@ -41,7 +41,7 @@ }, "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.25", + "@ldo/ldo": "^0.0.1-alpha.26", "@ldo/rdf-utils": "^0.0.1-alpha.24", "cross-fetch": "^3.1.6", "http-link-header": "^1.1.1" From 34554382eb8425a37109af567031ef88f4e7d66a Mon Sep 17 00:00:00 2001 From: Jackson Morgan Date: Fri, 19 Jul 2024 23:03:30 -0400 Subject: [PATCH 09/10] Fixed redirect errors when including a hash in the URL --- .../src/BrowserSolidLdoProvider.tsx | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/packages/solid-react/src/BrowserSolidLdoProvider.tsx b/packages/solid-react/src/BrowserSolidLdoProvider.tsx index 8d9d652..6213890 100644 --- a/packages/solid-react/src/BrowserSolidLdoProvider.tsx +++ b/packages/solid-react/src/BrowserSolidLdoProvider.tsx @@ -27,25 +27,31 @@ export const BrowserSolidLdoProvider: FunctionComponent = ({ await handleIncomingRedirect({ restorePreviousSession: true, }); - setSession({ ...getDefaultSession().info }); - window.history.replaceState( - {}, - "", - window.localStorage.getItem(PRE_REDIRECT_URI), - ); - window.localStorage.removeItem(PRE_REDIRECT_URI); + // Set timout to ensure this happens after the redirect + setTimeout(() => { + setSession({ ...getDefaultSession().info }); + window.history.replaceState( + {}, + "", + window.localStorage.getItem(PRE_REDIRECT_URI), + ); + window.localStorage.removeItem(PRE_REDIRECT_URI); - setRanInitialAuthCheck(true); + setRanInitialAuthCheck(true); + }, 0); }, []); const login = useCallback(async (issuer: string, options?: LoginOptions) => { + const cleanUrl = new URL(window.location.href); + cleanUrl.hash = ""; + cleanUrl.search = ""; const fullOptions = { - redirectUrl: window.location.href, + redirectUrl: cleanUrl.toString(), clientName: "Solid App", oidcIssuer: issuer, ...options, }; - window.localStorage.setItem(PRE_REDIRECT_URI, fullOptions.redirectUrl); + window.localStorage.setItem(PRE_REDIRECT_URI, window.location.href); await libraryLogin(fullOptions); setSession({ ...getDefaultSession().info }); }, []); From e4f41174c2b249dc0ff52d3e509b3878a17fe279 Mon Sep 17 00:00:00 2001 From: Jackson Morgan Date: Fri, 19 Jul 2024 23:04:54 -0400 Subject: [PATCH 10/10] v0.0.1-alpha.27 --- lerna.json | 2 +- package-lock.json | 8 ++++---- packages/demo-react/package.json | 4 ++-- packages/solid-react/package.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lerna.json b/lerna.json index 7c7b549..0fdd22a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.0.1-alpha.26" + "version": "0.0.1-alpha.27" } diff --git a/package-lock.json b/package-lock.json index 63dc9c2..dbfa660 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31696,10 +31696,10 @@ }, "packages/demo-react": { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.26", + "version": "0.0.1-alpha.27", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.26", + "@ldo/solid-react": "^0.0.1-alpha.27", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -32304,7 +32304,7 @@ }, "packages/solid-react": { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.26", + "version": "0.0.1-alpha.27", "license": "MIT", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", @@ -38221,7 +38221,7 @@ "@craco/craco": "^7.1.0", "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/cli": "^0.0.1-alpha.26", - "@ldo/solid-react": "^0.0.1-alpha.26", + "@ldo/solid-react": "^0.0.1-alpha.27", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", diff --git a/packages/demo-react/package.json b/packages/demo-react/package.json index 6644662..14d68b1 100644 --- a/packages/demo-react/package.json +++ b/packages/demo-react/package.json @@ -1,9 +1,9 @@ { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.26", + "version": "0.0.1-alpha.27", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.26", + "@ldo/solid-react": "^0.0.1-alpha.27", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", diff --git a/packages/solid-react/package.json b/packages/solid-react/package.json index 8453eff..3ebfea8 100644 --- a/packages/solid-react/package.json +++ b/packages/solid-react/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.26", + "version": "0.0.1-alpha.27", "description": "A React library for LDO and Solid", "main": "dist/index.js", "scripts": {