Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add type checking to CI #359

Merged
merged 5 commits into from
May 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/gorgeous-ravens-design.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@preact/signals-core": patch
---

Change effect callback return type from `void` to `unknown`. Same for effect cleanup function.
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ jobs:
- name: Build
run: pnpm build

- name: Lint
run: pnpm lint

- name: Tests
run: pnpm test

Expand Down
3 changes: 2 additions & 1 deletion docs/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"jsx": "react-jsx",
"jsxImportSource": "preact",
"module": "esnext"
}
},
"exclude": ["node_modules", "dist"]
}
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
"postbuild:preact": "cd packages/preact/dist && mv -f preact/src/index.d.ts signals.d.ts && rm -dr preact",
"postbuild:react": "cd packages/react/dist && mv -f react/src/index.d.ts signals.d.ts && rm -dr react",
"postbuild": "node ./scripts/node-13-exports.js",
"lint": "eslint 'packages/**/*.{ts,tsx,js,jsx}'",
"lint": "pnpm lint:eslint && pnpm lint:tsc",
"lint:eslint": "eslint 'packages/**/*.{ts,tsx,js,jsx}'",
"lint:tsc": "tsc -p tsconfig.json --noEmit",
"test": "pnpm test:karma && pnpm test:mocha",
"test:minify": "pnpm test:karma:minify && pnpm test:mocha",
"test:prod": "pnpm test:karma:prod && pnpm test:mocha:prod",
Expand All @@ -20,8 +22,8 @@
"test:karma:watch": "karma start karma.conf.js --no-single-run",
"test:karma:prod": "cross-env MINIFY=true NODE_ENV=production karma start karma.conf.js --single-run",
"test:karma:prod:watch": "cross-env NODE_ENV=production karma start karma.conf.js --no-single-run",
"test:mocha": "cross-env COVERAGE=true mocha --require packages/react/test/node/setup.js --recursive packages/react/test/node/**.test.tsx",
"test:mocha:prod": "cross-env COVERAGE=true NODE_ENV=production mocha --require packages/react/test/node/setup.js --recursive packages/react/test/node/**.test.tsx",
"test:mocha": "cross-env COVERAGE=true mocha --require test/node/setup.js --recursive packages/react/test/node/**.test.tsx",
"test:mocha:prod": "cross-env COVERAGE=true NODE_ENV=production mocha --require test/node/setup.js --recursive packages/react/test/node/**.test.tsx",
"docs:start": "cd docs && pnpm start",
"docs:build": "cd docs && pnpm build",
"docs:preview": "cd docs && pnpm preview",
Expand Down
13 changes: 7 additions & 6 deletions packages/core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -669,22 +669,23 @@ function endEffect(this: Effect, prevContext?: Computed | Effect) {
endBatch();
}

type EffectCleanup = () => unknown;
declare class Effect {
_compute?: () => void | (() => void);
_cleanup?: () => void;
_compute?: () => unknown | EffectCleanup;
_cleanup?: () => unknown;
_sources?: Node;
_nextBatchedEffect?: Effect;
_flags: number;

constructor(compute: () => void | (() => void));
constructor(compute: () => unknown | EffectCleanup);

_callback(): void;
_start(): () => void;
_notify(): void;
_dispose(): void;
}

function Effect(this: Effect, compute: () => void | (() => void)) {
function Effect(this: Effect, compute: () => unknown | EffectCleanup) {
this._compute = compute;
this._cleanup = undefined;
this._sources = undefined;
Expand All @@ -700,7 +701,7 @@ Effect.prototype._callback = function () {

const cleanup = this._compute();
if (typeof cleanup === "function") {
this._cleanup = cleanup;
this._cleanup = cleanup as EffectCleanup;
}
} finally {
finish();
Expand Down Expand Up @@ -738,7 +739,7 @@ Effect.prototype._dispose = function () {
}
};

function effect(compute: () => void | (() => void)): () => void {
function effect(compute: () => unknown | EffectCleanup): () => void {
const effect = new Effect(compute);
try {
effect._callback();
Expand Down
2 changes: 1 addition & 1 deletion packages/core/test/signal.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ describe("computed()", () => {
});

it("should disallow setting signal's value", () => {
const v: number = 123;
const v = 123;
const a: Signal = signal(v);
const c: Signal = computed(() => a.value++);

Expand Down
2 changes: 0 additions & 2 deletions packages/react/test/node/renderToStaticMarkup.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { signal, useSignalEffect } from "@preact/signals-react";
import { expect } from "chai";
import { createElement } from "react";
import { renderToStaticMarkup } from "react-dom/server";
import sinon from "sinon";
import { mountSignalsTests } from "../shared/mounting";

describe("renderToStaticMarkup", () => {
Expand Down
3 changes: 2 additions & 1 deletion packages/react/test/shared/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ export function checkConsoleErrorLogs(): void {
if (errorSpy.called) {
let message: string;
if (errorSpy.firstCall.args[0].toString().includes("%s")) {
message = consoleFormat(...errorSpy.firstCall.args);
const firstArg = errorSpy.firstCall.args[0];
message = consoleFormat(firstArg, ...errorSpy.firstCall.args.slice(1));
} else {
message = errorSpy.firstCall.args.join(" ");
}
Expand Down
8 changes: 8 additions & 0 deletions packages/react/test/node/setup.js → test/node/setup.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
// import register from "@babel/register";
const register = require("@babel/register").default;
const chai = require("chai");
const sinon = require("sinon");
const sinonChai = require("sinon-chai");

globalThis.expect = chai.expect;
// @ts-expect-error Not sure why TS isn't picking up the declared sinon global from karma-chai-sinon
globalThis.sinon = sinon;
chai.use(sinonChai);

const coverage = String(process.env.COVERAGE) === "true";

Expand Down
4 changes: 3 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
"jsxFragmentFactory": "Fragment",
"stripInternal": true,
"noUnusedLocals": true,
"noEmit": true,
"paths": {
"@preact/signals-core": ["./packages/core/src/index.ts"],
"@preact/signals": ["./packages/preact/src/index.ts"],
"@preact/signals-react": ["./packages/react/src/index.ts"]
}
}
},
"exclude": ["docs", "packages/*/dist/**"]
}
Loading