functionalscript 0.14.5 → 0.14.7

package/fs/ci/bun/module.f.d.ts

@@ -1,2 +1,2 @@
 import { type Architecture, type MetaStep, type Os } from '../common/module.f.ts';
-export declare const bunSteps: (v: Os, a: Architecture) => readonly MetaStep[];
+export declare const bunSteps: (extra: readonly MetaStep[]) => (v: Os, a: Architecture) => readonly MetaStep[];

package/fs/ci/bun/module.f.js

@@ -13,8 +13,8 @@ const installBun = installOnWindowsArm({
     name: 'bun',
     path: 'bun.sh',
 });
-export const bunSteps = (v, a) => clean([
+export const bunSteps = (extra) => (v, a) => clean([
     installBun(v)(a),
     test({ run: 'bun test --timeout 20000' }),
-    test({ run: 'bun ./fs/fjs/module.ts t' }),
+    ...extra,
 ]);

package/fs/ci/deno/module.f.d.ts

@@ -1,2 +1,2 @@
 import { type MetaStep } from '../common/module.f.ts';
-export declare const denoSteps: readonly MetaStep[];
+export declare const denoSteps: (extra: readonly MetaStep[]) => readonly MetaStep[];

package/fs/ci/deno/module.f.js

@@ -1,13 +1,11 @@
 import { deno } from "../config/module.f.js";
 import { clean, install, test } from "../common/module.f.js";
-export const denoSteps = clean([
+export const denoSteps = (extra) => clean([
     install({
         uses: 'denoland/setup-deno@v2',
         with: { 'deno-version': deno },
     }),
     test({ run: 'deno install' }),
     test({ run: 'deno task test' }),
-    test({ run: 'deno task fjs compile issues/demo/data/tree.json _tree.f.js' }),
-    test({ run: 'deno task fjs t' }),
-    test({ run: 'deno publish --dry-run' }),
+    ...extra,
 ]);

package/fs/ci/module.f.d.ts

@@ -1,6 +1,12 @@
 import { type Effect } from '../types/effects/module.f.ts';
 import { type NodeOp } from '../types/effects/node/module.f.ts';
 import { type MetaStep, type Os } from './common/module.f.ts';
-export declare const ci: (rust: boolean, extra: (os: Os) => readonly MetaStep[]) => Effect<NodeOp, number>;
+export type Setup = {
+    readonly rust: boolean;
+    readonly nodeExtra: (os: Os) => readonly MetaStep[];
+    readonly denoExtra: readonly MetaStep[];
+    readonly bunExtra: readonly MetaStep[];
+};
+export declare const ci: ({ rust, nodeExtra, denoExtra, bunExtra }: Setup) => Effect<NodeOp, number>;
 declare const _default: () => Effect<NodeOp, number>;
 export default _default;

package/fs/ci/module.f.js

@@ -13,20 +13,20 @@ import { nodeMainSteps, nodeVersions } from "./node/module.f.js";
 import { playwrightJob } from "./playwright/module.f.js";
 import { bunSteps } from "./bun/module.f.js";
 import { denoSteps } from "./deno/module.f.js";
-const job = (rust, extra) => (o) => (a) => {
+const job = (rust, nodeExtra, denoExtra, bunExtra) => (o) => (a) => {
     const id = `${o}-${a}`;
     const image = images[o][a];
     const result = [
         ...(rust ? rustSteps(o, a) : []),
-        ...nodeMainSteps(extra),
-        ...denoSteps,
-        ...bunSteps(o, a),
+        ...nodeMainSteps(nodeExtra),
+        ...denoSteps(denoExtra),
+        ...bunSteps(bunExtra)(o, a),
     ];
     return [id, { 'runs-on': image, steps: toSteps(result) }];
 };
-export const ci = (rust, extra) => {
+export const ci = ({ rust, nodeExtra, denoExtra, bunExtra }) => {
     const jobs = {
-        ...Object.fromEntries(os.flatMap(o => architecture.map(job(rust, extra(o))(o)))),
+        ...Object.fromEntries(os.flatMap(o => architecture.map(job(rust, nodeExtra(o), denoExtra, bunExtra)(o)))),
         ...nodeVersions,
         playwright: playwrightJob,
     };
@@ -39,11 +39,22 @@ export const ci = (rust, extra) => {
         .step(() => writeFile('.github/workflows/ci.yml', utf8(JSON.stringify(gha, null, '  '))))
         .step(() => pure(0));
 };
-const defaultEffect = ci(true, o => [
-    test({ run: 'npm pack' }),
-    test({ run: `npm install -g ${findTgz(o)}` }),
-    test({ run: 'fjs compile issues/demo/data/tree.json _tree.f.js' }),
-    test({ run: 'fjs t' }),
-    test({ run: 'npm uninstall functionalscript -g' }),
-]);
+const defaultEffect = ci({
+    rust: true,
+    nodeExtra: o => [
+        test({ run: 'npm pack' }),
+        test({ run: `npm install -g ${findTgz(o)}` }),
+        test({ run: 'fjs compile issues/demo/data/tree.json _tree.f.js' }),
+        test({ run: 'fjs t' }),
+        test({ run: 'npm uninstall functionalscript -g' }),
+    ],
+    denoExtra: [
+        test({ run: 'deno task fjs compile issues/demo/data/tree.json _tree.f.js' }),
+        test({ run: 'deno task fjs t' }),
+        test({ run: 'deno publish --dry-run' }),
+    ],
+    bunExtra: [
+        test({ run: 'bun ./fs/fjs/module.ts t' }),
+    ]
+});
 export default () => defaultEffect;

package/fs/ci/test.f.js

@@ -10,8 +10,8 @@ const githubState = {
     ...emptyState,
     root: { '.github': { workflows: {} } },
 };
-const run = (rust, extra = () => []) => {
-    const [state, result] = virtual(githubState)(ci(rust, extra));
+const run = (rust, nodeExtra = () => []) => {
+    const [state, result] = virtual(githubState)(ci({ rust, nodeExtra, denoExtra: [], bunExtra: [] }));
     assert(result === 0, result);
     const dotGithub = state.root['.github'];
     assert(dotGithub !== undefined && !isVec(dotGithub), dotGithub);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.14.5",
+  "version": "0.14.7",
   "type": "module",
   "files": [
     "**/*.js",