From 2c591a2757ac00d804de0078f6328a40429d8c5b Mon Sep 17 00:00:00 2001 From: Jackson Morgan Date: Sun, 23 Mar 2025 22:31:35 -0400 Subject: [PATCH] Tests run --- package-lock.json | 96 ++++++++++++++++--- packages/connected-solid/package.json | 26 ++++- .../connected-solid/src/util/isSolidUri.ts | 2 +- .../connected-solid/test/Integration.test.ts | 1 - packages/connected/package.json | 11 +-- 5 files changed, 107 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index c601804..c7913d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20687,22 +20687,13 @@ "dependencies": { "@ldo/dataset": "^1.0.0-alpha.1", "@ldo/ldo": "^1.0.0-alpha.1", - "@ldo/rdf-utils": "^1.0.0-alpha.1", - "@solid-notifications/subscription": "^0.1.2", - "cross-fetch": "^3.1.6", - "http-link-header": "^1.1.1", - "ws": "^8.18.0" + "@ldo/rdf-utils": "^1.0.0-alpha.1" }, "devDependencies": { - "@inrupt/solid-client-authn-core": "^2.2.6", - "@ldo/cli": "^1.0.0-alpha.1", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", - "@solid-notifications/types": "^0.1.2", - "@solid/community-server": "^7.1.3", "@types/jest": "^27.0.3", "cross-env": "^7.0.3", - "dotenv": "^16.3.1", "jest-rdf": "^1.8.0", "ts-jest": "^27.1.2", "ts-node": "^10.9.1", @@ -20807,10 +20798,89 @@ "version": "1.0.0-alpha.1", "license": "MIT", "dependencies": { - "@ldo/connected": "^1.0.0-alpha.1", - "@ldo/connected-nextgraph": "^1.0.0-alpha.1" + "@ldo/dataset": "^1.0.0-alpha.1", + "@ldo/ldo": "^1.0.0-alpha.1", + "@ldo/rdf-utils": "^1.0.0-alpha.1", + "@solid-notifications/subscription": "^0.1.2", + "cross-fetch": "^3.1.6", + "http-link-header": "^1.1.1", + "ws": "^8.18.0" }, - "devDependencies": {} + "devDependencies": { + "@inrupt/solid-client-authn-core": "^2.2.6", + "@ldo/cli": "^1.0.0-alpha.1", + "@rdfjs/data-model": "^1.2.0", + "@rdfjs/types": "^1.0.1", + "@solid-notifications/types": "^0.1.2", + "@solid/community-server": "^7.1.3", + "@types/jest": "^27.0.3", + "cross-env": "^7.0.3", + "jest-rdf": "^1.8.0", + "ts-jest": "^27.1.2", + "ts-node": "^10.9.1", + "typed-emitter": "^2.1.0", + "typedoc": "^0.25.4", + "typedoc-plugin-markdown": "^3.17.1" + } + }, + "packages/connected-solid/node_modules/ts-jest": { + "version": "27.1.5", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.5.tgz", + "integrity": "sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==", + "dev": true, + "license": "MIT", + "dependencies": { + "bs-logger": "0.x", + "fast-json-stable-stringify": "2.x", + "jest-util": "^27.0.0", + "json5": "2.x", + "lodash.memoize": "4.x", + "make-error": "1.x", + "semver": "7.x", + "yargs-parser": "20.x" + }, + "bin": { + "ts-jest": "cli.js" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "@babel/core": ">=7.0.0-beta.0 <8", + "@types/jest": "^27.0.0", + "babel-jest": ">=27.0.0 <28", + "jest": "^27.0.0", + "typescript": ">=3.8 <5.0" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "@types/jest": { + "optional": true + }, + "babel-jest": { + "optional": true + }, + "esbuild": { + "optional": true + } + } + }, + "packages/connected-solid/node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true, + "license": "Apache-2.0", + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } }, "packages/connected/node_modules/ts-jest": { "version": "27.1.5", diff --git a/packages/connected-solid/package.json b/packages/connected-solid/package.json index da52cef..2a53f50 100644 --- a/packages/connected-solid/package.json +++ b/packages/connected-solid/package.json @@ -6,7 +6,7 @@ "scripts": { "build": "tsc --project tsconfig.build.json", "watch": "tsc --watch", - "test": "jest --coverage", + "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --coverage", "test:watch": "jest --watch", "prepublishOnly": "npm run test && npm run build", "build:ldo": "ldo build --input src/.shapes --output src/.ldo", @@ -24,11 +24,29 @@ }, "homepage": "https://github.com/o-development/ldobjects/tree/main/packages/solid#readme", "devDependencies": { - + "@inrupt/solid-client-authn-core": "^2.2.6", + "@ldo/cli": "^1.0.0-alpha.1", + "@rdfjs/data-model": "^1.2.0", + "@rdfjs/types": "^1.0.1", + "@solid-notifications/types": "^0.1.2", + "@solid/community-server": "^7.1.3", + "@types/jest": "^27.0.3", + "cross-env": "^7.0.3", + "jest-rdf": "^1.8.0", + "ts-jest": "^27.1.2", + "ts-node": "^10.9.1", + "typed-emitter": "^2.1.0", + "typedoc": "^0.25.4", + "typedoc-plugin-markdown": "^3.17.1" }, "dependencies": { - "@ldo/connected": "^1.0.0-alpha.1", - "@ldo/connected-nextgraph": "^1.0.0-alpha.1" + "@ldo/dataset": "^1.0.0-alpha.1", + "@ldo/ldo": "^1.0.0-alpha.1", + "@ldo/rdf-utils": "^1.0.0-alpha.1", + "@solid-notifications/subscription": "^0.1.2", + "cross-fetch": "^3.1.6", + "http-link-header": "^1.1.1", + "ws": "^8.18.0" }, "files": [ "dist", diff --git a/packages/connected-solid/src/util/isSolidUri.ts b/packages/connected-solid/src/util/isSolidUri.ts index 6970d21..f90e402 100644 --- a/packages/connected-solid/src/util/isSolidUri.ts +++ b/packages/connected-solid/src/util/isSolidUri.ts @@ -36,7 +36,7 @@ export function isSolidContainerUri(uri: string): uri is SolidContainerUri { export function isSolidLeafUri(uri: string): uri is SolidLeafUri { try { const url = new URL(uri); - return url.pathname.endsWith("/"); + return !url.pathname.endsWith("/"); } catch { return false; } diff --git a/packages/connected-solid/test/Integration.test.ts b/packages/connected-solid/test/Integration.test.ts index e70fb91..9009c2d 100644 --- a/packages/connected-solid/test/Integration.test.ts +++ b/packages/connected-solid/test/Integration.test.ts @@ -163,7 +163,6 @@ describe("Integration", () => { // Start up the server app = await createApp(); await app.start(); - authFetch = await generateAuthFetch(); }); diff --git a/packages/connected/package.json b/packages/connected/package.json index fa47235..3bc25c4 100644 --- a/packages/connected/package.json +++ b/packages/connected/package.json @@ -23,15 +23,10 @@ }, "homepage": "https://github.com/o-development/ldobjects/tree/main/packages/solid#readme", "devDependencies": { - "@inrupt/solid-client-authn-core": "^2.2.6", - "@ldo/cli": "^1.0.0-alpha.1", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", - "@solid-notifications/types": "^0.1.2", - "@solid/community-server": "^7.1.3", "@types/jest": "^27.0.3", "cross-env": "^7.0.3", - "dotenv": "^16.3.1", "jest-rdf": "^1.8.0", "ts-jest": "^27.1.2", "ts-node": "^10.9.1", @@ -42,11 +37,7 @@ "dependencies": { "@ldo/dataset": "^1.0.0-alpha.1", "@ldo/ldo": "^1.0.0-alpha.1", - "@ldo/rdf-utils": "^1.0.0-alpha.1", - "@solid-notifications/subscription": "^0.1.2", - "cross-fetch": "^3.1.6", - "http-link-header": "^1.1.1", - "ws": "^8.18.0" + "@ldo/rdf-utils": "^1.0.0-alpha.1" }, "files": [ "dist",