Compare commits

...

2 Commits

Author SHA1 Message Date
Laurin Weger 7dbc947abd
feat: add playwright 2 weeks ago
Laurin Weger 63646f3e1a
chore: do not create new deepSignal on every update 2 weeks ago
  1. 8
      .gitignore
  2. 64
      package-lock.json
  3. 4
      package.json
  4. 79
      playwright.config.ts
  5. 10
      src/frontends/tests/reactiveCrossFramework.spec.ts
  6. 84
      src/ng-mock/js-land/connector/createSignalObjectForShape.ts
  7. 75
      src/ng-mock/js-land/connector/ngSignals.ts
  8. 9
      src/ng-mock/js-land/frontendAdapters/react/useShape.ts
  9. 7
      src/ng-mock/js-land/frontendAdapters/svelte/useShape.ts
  10. 7
      src/ng-mock/js-land/frontendAdapters/vue/useShape.ts
  11. 2
      src/ng-mock/tests/updatesWithWasm.test.ts
  12. 4
      src/ng-mock/wasm-land/requestShape.ts

8
.gitignore vendored

@ -33,4 +33,10 @@ report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
# Finder (MacOS) folder config
.DS_Store
.astro
.astro
# Playwright
/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/

64
package-lock.json generated

@ -28,6 +28,7 @@
"vue": "3.5.19"
},
"devDependencies": {
"@playwright/test": "^1.55.0",
"@types/node": "24.3.0",
"@types/react": "19.1.10",
"@types/react-dom": "19.1.7",
@ -1407,6 +1408,22 @@
"integrity": "sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ==",
"license": "MIT"
},
"node_modules/@playwright/test": {
"version": "1.55.0",
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.55.0.tgz",
"integrity": "sha512-04IXzPwHrW69XusN/SIdDdKZBzMfOT9UNT/YiJit/xpy2VuAoB8NHc8Aplb96zsWDddLnbkPL3TsmrS04ZU2xQ==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
"playwright": "1.55.0"
},
"bin": {
"playwright": "cli.js"
},
"engines": {
"node": ">=18"
}
},
"node_modules/@polka/url": {
"version": "1.0.0-next.29",
"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
@ -7520,6 +7537,53 @@
"url": "https://github.com/sponsors/jonschlinkert"
}
},
"node_modules/playwright": {
"version": "1.55.0",
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.55.0.tgz",
"integrity": "sha512-sdCWStblvV1YU909Xqx0DhOjPZE4/5lJsIS84IfN9dAZfcl/CIZ5O8l3o0j7hPMjDvqoTF8ZUcc+i/GL5erstA==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
"playwright-core": "1.55.0"
},
"bin": {
"playwright": "cli.js"
},
"engines": {
"node": ">=18"
},
"optionalDependencies": {
"fsevents": "2.3.2"
}
},
"node_modules/playwright-core": {
"version": "1.55.0",
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.55.0.tgz",
"integrity": "sha512-GvZs4vU3U5ro2nZpeiwyb0zuFaqb9sUiAJuyrWpcGouD8y9/HLgGbNRjIph7zU9D3hnPaisMl9zG9CgFi/biIg==",
"dev": true,
"license": "Apache-2.0",
"bin": {
"playwright-core": "cli.js"
},
"engines": {
"node": ">=18"
}
},
"node_modules/playwright/node_modules/fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"dev": true,
"hasInstallScript": true,
"license": "MIT",
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
}
},
"node_modules/postcss": {
"version": "8.5.6",
"funding": [

@ -9,7 +9,8 @@
"build": "astro build",
"preview": "astro preview",
"astro": "astro",
"test": "vitest"
"test": "vitest",
"test:e2e": "playwright test"
},
"dependencies": {
"@astrojs/react": "4.3.0",
@ -32,6 +33,7 @@
"vue": "3.5.19"
},
"devDependencies": {
"@playwright/test": "^1.55.0",
"@types/node": "24.3.0",
"@types/react": "19.1.10",
"@types/react-dom": "19.1.7",

@ -0,0 +1,79 @@
import { defineConfig, devices } from "@playwright/test";
/**
* Read environment variables from file.
* https://github.com/motdotla/dotenv
*/
// import dotenv from 'dotenv';
// import path from 'path';
// dotenv.config({ path: path.resolve(__dirname, '.env') });
/**
* See https://playwright.dev/docs/test-configuration.
*/
export default defineConfig({
testDir: "./src/frontends/tests",
/* Run tests in files in parallel */
fullyParallel: true,
/* Fail the build on CI if you accidentally left test.only in the source code. */
forbidOnly: !!process.env.CI,
/* Retry on CI only */
retries: process.env.CI ? 2 : 0,
/* Opt out of parallel tests on CI. */
workers: process.env.CI ? 1 : undefined,
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
reporter: "html",
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
use: {
/* Base URL to use in actions like `await page.goto('/')`. */
baseURL: "http://localhost:4321",
/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
trace: "on-first-retry",
},
/* Configure projects for major browsers */
projects: [
{
name: "chromium",
use: { ...devices["Desktop Chrome"] },
},
{
name: "firefox",
use: { ...devices["Desktop Firefox"] },
},
{
name: "webkit",
use: { ...devices["Desktop Safari"] },
},
/* Test against mobile viewports. */
// {
// name: 'Mobile Chrome',
// use: { ...devices['Pixel 5'] },
// },
// {
// name: 'Mobile Safari',
// use: { ...devices['iPhone 12'] },
// },
/* Test against branded browsers. */
// {
// name: 'Microsoft Edge',
// use: { ...devices['Desktop Edge'], channel: 'msedge' },
// },
// {
// name: 'Google Chrome',
// use: { ...devices['Desktop Chrome'], channel: 'chrome' },
// },
],
/* Run your local dev server before starting the tests */
webServer: {
command: "npm run dev",
url: "http://localhost:4321",
reuseExistingServer: !process.env.CI,
},
});

@ -0,0 +1,10 @@
import { test, expect } from "@playwright/test";
test("components load", async ({ page }) => {
await page.goto("/");
await page.waitForSelector(".vue astro-island");
await expect(page.locator(".vue .title")).toHaveText("vue");
await expect(page.locator(".react .title")).toHaveText("react");
await expect(page.locator(".svelte .title")).toHaveText("svelte");
});

@ -0,0 +1,84 @@
import updateShape from "src/ng-mock/wasm-land/updateShape";
import type { Connection, Diff, Scope, Shape } from "../types";
import requestShape from "src/ng-mock/wasm-land/requestShape";
import { applyDiff } from "./applyDiff";
import { batch, deepSignal, watch } from "alien-deepsignals";
import { signal as createSignal, computed } from "alien-signals";
type ReactiveShapeObject = object;
type ShapeObjectSignal = ReturnType<
typeof createSignal<{
content: ReactiveShapeObject | null;
}>
>;
const openConnections: Partial<Record<Shape, ShapeObjectSignal>> = {};
/**
* Create a signal for a shape object.
* The function returns a signal of a shape object in the form:
* `{content: <shapeObject>}`
**/
export function createSignalObjectForShape(
shape: Shape,
scope?: Scope,
poolSignal = true
) {
if (poolSignal && openConnections[shape]) return openConnections[shape];
// DeepSignal has a different API to alien-signals.
// Therefore, we need to create a "root signal" wrapper that is
// triggered on deepSignal changes.
const rootSignal = createSignal<{
content: ReactiveShapeObject | null;
}>({ content: null });
// State
let stopWatcher: any = null;
let suspendDeepWatcher = false;
const onUpdateFromDb = (diff: Diff, connectionId: Connection["id"]) => {
const rootSignalValue = rootSignal();
console.log("Update received", connectionId, diff);
// Set new value from applying the diffs to the old value.
suspendDeepWatcher = true;
// We need to replace the root signal for now, so this is redundant.
batch(() => {
if (!rootSignalValue) return; // This shouldn't happen but we make the compiler happy.
const { content: proxiedShapeObj } = rootSignalValue;
applyDiff(proxiedShapeObj, diff);
// We put the proxied object into a new object for the root signal to trigger.
rootSignal({ content: proxiedShapeObj });
});
suspendDeepWatcher = false;
};
// Do the actual db request.
requestShape(shape, scope, onUpdateFromDb).then(
({ connectionId, shapeObject }) => {
// Create a deepSignal to put into the vanilla alien-signal.
const proxiedShapeObj = deepSignal(shapeObject);
// Notify DB on changes.
stopWatcher = watch(
proxiedShapeObj,
(newVal, oldVal, onCleanup) => {
// Don't update when applying changes from db diffs from the db.
if (!suspendDeepWatcher) updateShape(connectionId, newVal);
},
{ deep: true }
);
// Update the root signal.
rootSignal({ content: proxiedShapeObj });
}
);
if (poolSignal) openConnections[shape] = rootSignal;
// TODO: Dispose deepSignal root signal disposal.
return rootSignal;
}

@ -1,75 +0,0 @@
import updateShape from "src/ng-mock/wasm-land/updateShape";
import type { Connection, Diff, Scope, Shape } from "../types";
import requestShape from "src/ng-mock/wasm-land/requestShape";
import { applyDiff } from "./applyDiff";
import { batch, deepSignal, watch } from "alien-deepsignals";
import { signal } from "alien-signals";
const openConnections: Record<Shape, ReturnType<typeof signal>> = {};
// TODO: The code is horrible.
export function createSignalObjectForShape(shape: Shape, scope?: Scope) {
if (openConnections[shape]) return openConnections[shape];
// TODO:
// DeepSignal has a different API to alien-signals.
// Therefore, we need to create a "root signal" wrapper that is
// triggered on deepSignal changes.
const rootSignal = signal<null | object>(null);
// State
let stopWatcher: any = null;
let suspendWatcher = false;
// To update the root signal
const setUpDeepSignal = (
newSignal: ReturnType<typeof deepSignal>,
connectionId: Connection["id"]
) => {
stopWatcher?.();
// Notify DB on changes.
stopWatcher = watch(
newSignal,
(newVal, oldVal, onCleanup) => {
if (!suspendWatcher) updateShape(connectionId, newVal);
},
{ deep: true }
);
// Update the root signal.
rootSignal(newSignal);
};
const onUpdateFromDb = (diff: Diff, connectionId: Connection["id"]) => {
const nestedObj = rootSignal();
console.log("Update received", connectionId, diff);
// Set new value from applying the diffs to the old value.
// suspendWatcher = true;
// We need to replace the root signal for now, so this is redundant.
// batch(() => {
// if (!nestedObj) return; // This shouldn't happen but we make the compiler happy.
// applyDiff(nestedObj, diff);
// });
// suspendWatcher = false;nestedObj
// Create a new deep signal.
// We need to do that because the deepSignals ref hasn't changed otherwise
// and no update is triggered.
const newDeepSignal = deepSignal(JSON.parse(JSON.stringify(diff)));
setUpDeepSignal(newDeepSignal, connectionId);
};
// Do the actual db request.
requestShape(shape, scope, onUpdateFromDb).then(
({ connectionId, shapeObject }) => {
// Create a deepSignal to put into the vanilla alien-signal.
const deepSignalFromDb = deepSignal(shapeObject);
setUpDeepSignal(deepSignalFromDb, connectionId);
}
);
openConnections[shape] = rootSignal;
return rootSignal;
}

@ -1,15 +1,18 @@
import { useSignal } from "@gn8/alien-signals-react";
import { useMemo } from "react";
import { createSignalObjectForShape } from "src/ng-mock/js-land/connector/ngSignals";
import { useMemo, useRef } from "react";
import { createSignalObjectForShape } from "src/ng-mock/js-land/connector/createSignalObjectForShape";
import type { Scope, Shape } from "src/ng-mock/js-land/types";
// TODO: The universe-signal library causes two renders on change instead of one.
// Find a fix
const useShape = (shape: Shape, scope: Scope) => {
const signalOfShape = useMemo(() => {
console.log("react memo called...");
return createSignalObjectForShape(shape, scope);
}, [shape, scope]);
const [shapeObject, setShapeObject] = useSignal(signalOfShape);
const [{ content: shapeObject }, setShapeObject] = useSignal(signalOfShape);
// We don't need the setter.
// The object is recursively proxied and changes are recorded there.

@ -1,5 +1,6 @@
import { derived } from "svelte/store";
import { useSignal } from "@gn8/alien-signals-svelte";
import { createSignalObjectForShape } from "src/ng-mock/js-land/connector/ngSignals";
import { createSignalObjectForShape } from "src/ng-mock/js-land/connector/createSignalObjectForShape";
import type { Scope, Shape } from "src/ng-mock/js-land/types";
const useShape = (shape: Shape, scope: Scope) => {
@ -7,7 +8,9 @@ const useShape = (shape: Shape, scope: Scope) => {
const writeableStoreForShape = useSignal(signalOfShape);
return writeableStoreForShape;
// Get the content "deepSignal"
const content = derived(writeableStoreForShape, (value) => value.content);
return content;
};
export default useShape;

@ -1,13 +1,14 @@
import { useSignal } from "@gn8/alien-signals-vue";
import { createSignalObjectForShape } from "src/ng-mock/js-land/connector/ngSignals";
import { createSignalObjectForShape } from "src/ng-mock/js-land/connector/createSignalObjectForShape";
import type { Scope, Shape } from "src/ng-mock/js-land/types";
import { computed } from "vue";
const useShape = (shape: Shape, scope: Scope) => {
const signalOfShape = createSignalObjectForShape(shape, scope);
const refOfShape = useSignal(signalOfShape);
return refOfShape;
// TODO: Maybe `refOfShape.value.content` works too?
return computed(() => refOfShape.value.content);
};
export default useShape;

@ -1,5 +1,5 @@
import { expect, test } from "vitest";
import { createSignalObjectForShape } from "../js-land/connector/ngSignals";
import { createSignalObjectForShape } from "../js-land/connector/createSignalObjectForShape";
const wait = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));

@ -24,6 +24,8 @@ const mockShapeObject2 = {
},
};
let connectionIdCounter = 1;
export default async function requestShape(
shape: Shape,
scope: Scope | undefined,
@ -33,7 +35,7 @@ export default async function requestShape(
shapeObject: object;
}> {
const connection: WasmConnection = {
id: Math.random().toFixed(4),
id: String(connectionIdCounter++),
shape,
// Create a deep copy to prevent accidental by-reference changes.
state: JSON.parse(

Loading…
Cancel
Save