Merge pull request #97 from o-development/feat/test-ci

Add ci tests
3 months ago · cc7ace8cfc
parent d5279186a1 7034d69ea8
commit cc7ace8cfc
25 changed files with 845 additions and 1026 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -0,0 +1,28 @@
+name: CI - Build & Test
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: 'npm'
+
+      - name: Install dependencies using npm workspaces
+        run: npm install
+
+      - name: Build all packages in topological order
+        run: npm run build
+
+      - name: Run tests
+        run: npm test
--- a/.gitignore
+++ b/.gitignore
@ -18,3 +18,5 @@ yarn-error.log*
 coverage/

 docs/
+
+.nx
--- a/nx.json
+++ b/nx.json
@ -1,28 +0,0 @@
-{
-  "tasksRunnerOptions": {
-    "default": {
-      "runner": "nx/tasks-runners/default",
-      "options": {
-        "cacheableOperations": [
-          "build",
-          "test"
-        ]
-      }
-    }
-  },
-  "targetDefaults": {
-    "build": {
-      "dependsOn": [
-        "^build"
-      ],
-      "outputs": [
-        "{projectRoot}/dist"
-      ]
-    },
-    "test": {
-      "outputs": [
-        "{projectRoot}/coverage"
-      ]
-    }
-  }
-}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -8,7 +8,7 @@
    "test": "lerna run test",
    "build": "lerna run build",
    "lint": "lerna run lint",
-    "clean": "lerna run clean",
+    "clean": "lerna clean --yes && lerna run remove-dist && rimraf node_modules",
    "publish": "lerna publish --no-private"
  },
  "devDependencies": {
@ -20,6 +20,7 @@
    "@typescript-eslint/eslint-plugin": "^6.5.0",
    "@typescript-eslint/parser": "^6.5.0",
    "@vitejs/plugin-react": "^4.4.1",
+    "@vitest/coverage-istanbul": "^3.2.3",
    "eslint": "^8.48.0",
    "eslint-config-prettier": "^9.0.0",
    "eslint-plugin-prettier": "^5.0.0",
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -8,9 +8,9 @@
    "ldo": "./dist/index.js"
  },
  "scripts": {
-    "build": "npm run clean && npm run build:ts && npm run copy-files && npm run update-permission",
+    "build": "npm run remove-dist && npm run build:ts && npm run copy-files && npm run update-permission",
    "build:ts": "tsc --project tsconfig.cjs.json",
-    "clean": "rimraf dist/",
+    "remove-dist": "rimraf dist/",
    "copy-files": "copyfiles -u 1 \"./src/**/*.ejs\" dist/",
    "update-permission": "chmod +x ./dist/index.js",
    "test": "jest --coverage",
@ -61,4 +61,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/connected-nextgraph/package.json
+++ b/packages/connected-nextgraph/package.json
@ -18,13 +18,14 @@
    "build": "rimraf dist && npm run build:cjs && npm run build:esm",
    "build:cjs": "tsc --project tsconfig.cjs.json",
    "build:esm": "tsc --project tsconfig.esm.json",
-    "test": "npm run test:integration",
+    "test": "[ \"$CI\" = \"true\" ] && echo 'Skipping integration tests in CI.' || npm run test:integration",
    "prepublishOnly": " npm run build",
    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
    "docs": "typedoc --plugin typedoc-plugin-markdown",
    "start-test-server": "./test/ngd -vv --save-key -l 14400 --base ./test/nextgraph-data",
    "start-integration-test": "vitest run --coverage",
-    "test:integration": "start-server-and-test start-test-server http-get://localhost:14400 start-integration-test"
+    "test:integration": "start-server-and-test start-test-server http-get://localhost:14400 start-integration-test",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -69,4 +70,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/connected-solid/package.json
+++ b/packages/connected-solid/package.json
@ -22,7 +22,8 @@
    "prepublishOnly": " npm run build",
    "build:ldo": "ldo build --input src/.shapes --output src/.ldo",
    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
-    "docs": "typedoc --plugin typedoc-plugin-markdown"
+    "docs": "typedoc --plugin typedoc-plugin-markdown",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -48,6 +49,7 @@
    "typedoc-plugin-markdown": "^3.17.1"
  },
  "dependencies": {
+    "@ldo/connected": "^1.0.0-alpha.21",
    "@ldo/dataset": "^1.0.0-alpha.21",
    "@ldo/ldo": "^1.0.0-alpha.21",
    "@ldo/rdf-utils": "^1.0.0-alpha.21",
@ -64,4 +66,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/connected-solid/test/Integration.test.ts
+++ b/packages/connected-solid/test/Integration.test.ts
@ -47,7 +47,7 @@ import {
 import { getStorageFromWebId } from "../src/getStorageFromWebId.js";
 import type { ResourceInfo } from "@ldo/test-solid-server";
 import { createApp, setupServer } from "@ldo/test-solid-server";
-import { describe, it, expect, vi, beforeEach } from "vitest";
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";

 const ROOT_CONTAINER = "http://localhost:3001/";
 const WEB_ID = "http://localhost:3001/example/profile/card#me";
@ -2040,6 +2040,14 @@ describe("Integration", () => {
    const spidermanNode = namedNode("http://example.org/#spiderman");
    const foafNameNode = namedNode("http://xmlns.com/foaf/0.1/name");

+    afterEach(async () => {
+      await Promise.all(
+        solidLdoDataset.getResources().map(async (resource) => {
+          await resource.unsubscribeFromAllNotifications();
+        }),
+      );
+    });
+
    it("handles notification when a resource is updated", async () => {
      const resource = solidLdoDataset.getResource(SAMPLE_DATA_URI);
      await resource.read();
--- a/packages/connected/package.json
+++ b/packages/connected/package.json
@ -22,7 +22,8 @@
    "prepublishOnly": " npm run build",
    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
    "docs": "typedoc --plugin typedoc-plugin-markdown",
-    "build:ldo": "ldo build --input test/.shapes --output test/.ldo"
+    "build:ldo": "ldo build --input test/.shapes --output test/.ldo",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -35,7 +36,6 @@
  },
  "homepage": "https://github.com/o-development/ldo/tree/main/packages/solid#readme",
  "devDependencies": {
-    "@ldo/connected-solid": "^1.0.0-alpha.26",
    "@ldo/test-solid-server": "^1.0.0-alpha.24",
    "@rdfjs/types": "^1.0.1",
    "cross-env": "^7.0.3",
@ -61,4 +61,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/connected/test/LinkTraversalIntegration.test.ts
+++ b/packages/connected/test/LinkTraversalIntegration.test.ts
@ -114,7 +114,7 @@ describe("Link Traversal", () => {
    // Unsubscribe
  });

-  it.only("handles subscriptions if data changes on the Pod", async () => {
+  it("handles subscriptions if data changes on the Pod", async () => {
    const mainProfileResource = solidLdoDataset.getResource(MAIN_PROFILE_URI);
    const linkQuery = solidLdoDataset
      .usingType(SolidProfileShapeShapeType)
--- a/packages/dataset/package.json
+++ b/packages/dataset/package.json
@ -22,7 +22,8 @@
    "example:extendedDataset": "ts-node ./example/extendedDatasetExample.ts",
    "example:loadData": "ts-node ./example/loadDataExample.ts",
    "prepublishOnly": " npm run build",
-    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern"
+    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -56,4 +57,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/jsonld-dataset-proxy/package.json
+++ b/packages/jsonld-dataset-proxy/package.json
@ -22,7 +22,8 @@
    "prepublishOnly": " npm run build",
    "start": "ts-node ./example/example.ts",
    "start:lang": "ts-node ./example/languageExample.ts",
-    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern"
+    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -57,4 +58,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/ldo/package.json
+++ b/packages/ldo/package.json
@ -22,7 +22,8 @@
    "example": "ts-node ./example/example.ts",
    "prepublishOnly": " npm run build",
    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
-    "docs": "typedoc --plugin typedoc-plugin-markdown"
+    "docs": "typedoc --plugin typedoc-plugin-markdown",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -63,4 +64,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/rdf-utils/package.json
+++ b/packages/rdf-utils/package.json
@ -20,7 +20,8 @@
    "test": "jest --coverage",
    "test:watch": "jest --watch",
    "prepublishOnly": " npm run build",
-    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern"
+    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -49,4 +50,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/react/package.json
+++ b/packages/react/package.json
@ -21,7 +21,8 @@
    "test": "vitest run --coverage",
    "prepublishOnly": " npm run build",
    "build:ldo": "ldo build --input src/shapes --output src/ldo",
-    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern"
+    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -55,4 +56,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/schema-converter-shex/package.json
+++ b/packages/schema-converter-shex/package.json
@ -20,7 +20,8 @@
    "build:esm": "tsc --project tsconfig.esm.json",
    "test": "jest --coverage",
    "prepublishOnly": " npm run build",
-    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern"
+    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -52,4 +53,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/solid-react/package.json
+++ b/packages/solid-react/package.json
@ -40,7 +40,8 @@
    "@rdfjs/types": "^1.0.1",
    "@testing-library/react": "^14.1.2",
    "start-server-and-test": "^2.0.3",
-    "whatwg-fetch": "^3.6.20"
+    "whatwg-fetch": "^3.6.20",
+    "remove-dist": "rimraf dist/"
  },
  "dependencies": {
    "@inrupt/solid-client-authn-browser": "2.5.0",
@ -57,4 +58,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/solid-type-index/package.json
+++ b/packages/solid-type-index/package.json
@ -21,7 +21,8 @@
    "test": "vitest run --coverage",
    "prepublishOnly": " npm run build",
    "build:ldo": "ldo build --input src/.shapes --output src/.ldo",
-    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern"
+    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -54,4 +55,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/subscribable-dataset/package.json
+++ b/packages/subscribable-dataset/package.json
@ -21,7 +21,8 @@
    "test": "jest --coverage",
    "example:subscribableDataset": "ts-node ./example/subscribableDatasetExample.ts",
    "prepublishOnly": " npm run build",
-    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern"
+    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -54,4 +55,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@ -25,7 +25,8 @@
    "test": "jest --coverage",
    "lint": "eslint . --ext .js,.ts,.svelte --fix --no-error-on-unmatched-pattern",
    "format": "prettier --write .",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -79,4 +80,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/test-solid-server/package.json
+++ b/packages/test-solid-server/package.json
@ -20,7 +20,8 @@
    "build:esm": "tsc --project tsconfig.esm.json",
    "prepublishOnly": "npm run build",
    "copy-configs": "cp -r src/configs dist/cjs/configs && cp -r src/configs dist/esm/configs",
-    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern"
+    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -45,4 +46,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/test-solid-server/src/setupTestServer.ts
+++ b/packages/test-solid-server/src/setupTestServer.ts
@ -22,7 +22,7 @@ import { fileURLToPath } from "node:url";
 const __dirname = dirname(fileURLToPath(import.meta.url));

 // Use an increased timeout, since the CSS server takes too much setup time.
-vi.setConfig({ testTimeout: 40_000 });
+vi.setConfig({ testTimeout: 40_000, hookTimeout: 40_000 });

 export function setupServer(
  port: number,
@ -56,11 +56,31 @@ export function setupServer(
  });

  afterAll(async () => {
-    data.app.stop();
+    // We're potentially ignoring data clean up and server shutdown because
+    // sometimes this doesn't work in CI.
+    try {
+      await Promise.race([
+        data.app.stop?.(),
+        new Promise((_, reject) =>
+          setTimeout(() => reject(new Error("Shutdown timeout")), 10000),
+        ),
+      ]);
+    } catch (err) {
+      console.warn("⚠️ Ignoring shutdown error in CI:", (err as Error).message);
+    }
+
+    try {
+      const testDataPath = path.join(__dirname, `./data${port}`);
+      await fs.rm(testDataPath, { recursive: true, force: true });
+    } catch (err) {
+      console.warn(
+        "⚠️ Ignoring data cleanup error in CI:",
+        (err as Error).message,
+      );
+    }
+
    process.env.JEST_WORKER_ID = previousJestId;
    process.env.NODE_ENV = previousNodeEnv;
-    const testDataPath = path.join(__dirname, `./data${port}`);
-    await fs.rm(testDataPath, { recursive: true, force: true });
  });

  beforeEach(async () => {
--- a/packages/traverser-shexj/package.json
+++ b/packages/traverser-shexj/package.json
@ -20,7 +20,8 @@
    "build:esm": "tsc --project tsconfig.esm.json",
    "test": "jest --coverage",
    "prepublishOnly": " npm run build",
-    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern"
+    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -43,4 +44,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}
--- a/packages/type-traverser/package.json
+++ b/packages/type-traverser/package.json
@ -21,7 +21,8 @@
    "test": "jest --coverage",
    "start": "ts-node ./example/example",
    "prepublishOnly": " npm run build",
-    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern"
+    "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
+    "remove-dist": "rimraf dist/"
  },
  "repository": {
    "type": "git",
@ -49,4 +50,4 @@
    "access": "public"
  },
  "gitHead": "840910c56ec3f61416f031cc76771a5673af6757"
-}
+}