functionalscript 0.26.0 → 0.27.0

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

@@ -28,7 +28,7 @@ export declare const node: {
 };
 export declare const wasmtime = "45.0.0";
 export declare const wasmer = "7.1.0";
-export declare const tsgo = "7.0.0-dev.20260605.1";
+export declare const tsgo = "7.0.0-dev.20260606.1";
 export declare const actions: {
     readonly 'actions/checkout': "v6";
     readonly 'actions/setup-node': "v6";

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

@@ -36,7 +36,7 @@ export const wasmtime = '45.0.0';
 // https://github.com/wasmerio/wasmer/releases
 export const wasmer = '7.1.0';
 // https://www.npmjs.com/package/@typescript/native-preview?activeTab=versions
-export const tsgo = '7.0.0-dev.20260605.1';
+export const tsgo = '7.0.0-dev.20260606.1';
 // GitHub Action versions used by CI step builders. The key is the action
 // `owner/name`; call sites compose the full ref as
 // `` `${name}@${actions[name]}` ``.

package/fs/ci/module.f.js

@@ -3,9 +3,10 @@
  *
  * @module
  */
-import { utf8 } from "../text/module.f.js";
+import { utf8, utf8ToString } from "../text/module.f.js";
+import { validatePackageJsonText } from "../dev/package_json/module.f.js";
 import { pure } from "../effects/module.f.js";
-import { access, writeFile } from "../effects/node/module.f.js";
+import { access, readFile, writeFile } from "../effects/node/module.f.js";
 import { images } from "./config/module.f.js";
 import { architecture, findTgz, os, test, toSteps } from "./common/module.f.js";
 import { rustSteps } from "./rust/module.f.js";
@@ -24,6 +25,20 @@ const job = (rust, nodeExtra, denoExtra, bunExtra) => (o) => (a) => {
     ];
     return [id, { 'runs-on': image, steps: toSteps(result) }];
 };
+const functionalscriptPackageName = 'functionalscript';
+const fallbackPackageInfo = {
+    name: functionalscriptPackageName,
+    functionalscript: false,
+};
+const packageInfoFromPackageJson = ({ name }) => name !== undefined
+    ? { name, functionalscript: name === functionalscriptPackageName }
+    : fallbackPackageInfo;
+const packageInfoFromText = (text) => {
+    const result = validatePackageJsonText(text);
+    return result[0] === 'ok' ? packageInfoFromPackageJson(result[1]) : fallbackPackageInfo;
+};
+const readPackageInfo = readFile('package.json')
+    .step(result => pure(result[0] === 'ok' ? packageInfoFromText(utf8ToString(result[1])) : fallbackPackageInfo));
 export const ci = ({ nodeExtra, denoExtra, bunExtra }) => access('Cargo.toml').step(result => {
     const rust = result[0] === 'ok';
     const jobs = {
@@ -42,21 +57,29 @@ export const ci = ({ nodeExtra, denoExtra, bunExtra }) => access('Cargo.toml').s
     return writeFile('.github/workflows/ci.yml', utf8(JSON.stringify(gha, null, '  ')))
         .step(() => pure(0));
 });
-const defaultEffect = ci({
-    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' }),
-    ],
+const demoCompile = [
+    test({ run: 'fjs compile issues/demo/data/tree.json _tree.f.js' }),
+    test({ run: 'fjs t' }),
+];
+const denoDemoCompile = [
+    test({ run: 'deno task fjs compile issues/demo/data/tree.json _tree.f.js' }),
+    test({ run: 'deno task fjs t' }),
+];
+const bunDemoCompile = [
+    test({ run: 'bun ./fs/fjs/module.ts t' }),
+];
+const defaultNodeExtra = ({ name, functionalscript }) => (o) => [
+    test({ run: 'npm pack' }),
+    test({ run: `npm install -g ${findTgz(o)}` }),
+    ...(functionalscript ? demoCompile : []),
+    test({ run: `npm uninstall ${name} -g` }),
+];
+const defaultEffect = (info) => ci({
+    nodeExtra: defaultNodeExtra(info),
     denoExtra: [
-        test({ run: 'deno task fjs compile issues/demo/data/tree.json _tree.f.js' }),
-        test({ run: 'deno task fjs t' }),
+        ...(info.functionalscript ? denoDemoCompile : []),
         test({ run: 'deno publish --dry-run --allow-slow-types' }),
     ],
-    bunExtra: [
-        test({ run: 'bun ./fs/fjs/module.ts t' }),
-    ]
+    bunExtra: info.functionalscript ? bunDemoCompile : [],
 });
-export const main = () => defaultEffect;
+export const main = () => readPackageInfo.step(defaultEffect);

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

@@ -5,4 +5,13 @@ export declare const proof: {
         allOs: () => void;
         osSpecific: () => void;
     };
+    defaultSetup: {
+        functionalscriptDemo: () => void;
+        otherPackageNoDemo: () => void;
+        uninstallPackageName: () => void;
+        malformedPackageJsonFallback: () => void;
+        missingPackageJsonFallback: () => void;
+        missingNameFallback: () => void;
+        nonObjectFallback: () => void;
+    };
 };

package/fs/ci/proof.f.js

@@ -1,5 +1,5 @@
-import { ci } from "./module.f.js";
-import { utf8ToString } from "../text/module.f.js";
+import { ci, main } from "./module.f.js";
+import { utf8, utf8ToString } from "../text/module.f.js";
 import { empty as emptyVec, isVec } from "../types/bit_vec/module.f.js";
 import { test, parseGitHubAction } from "./common/module.f.js";
 import { assert } from "../asserts/module.f.js";
@@ -8,16 +8,15 @@ import { parse as jsonParse } from "../json/module.f.js";
 import { unwrap } from "../types/result/module.f.js";
 const hasRun = (cmd) => (gha) => Object.values(gha.jobs).some(job => job.steps.some(step => step.run?.includes(cmd)));
 const hasRunInJob = (jobId, cmd) => (gha) => gha.jobs[jobId]?.steps.some(step => step.run?.includes(cmd)) ?? false;
-const makeState = (rust) => ({
+const makeState = (rust, packageJson) => ({
     ...emptyState,
     root: {
         '.github': { workflows: {} },
+        ...(packageJson !== undefined ? { 'package.json': utf8(packageJson) } : {}),
         ...(rust ? { 'Cargo.toml': emptyVec } : {}),
     },
 });
-const run = (rust, nodeExtra = () => []) => {
-    const [state, result] = virtual(makeState(rust))(ci({ nodeExtra, denoExtra: [], bunExtra: [] }));
-    assert(result === 0, result);
+const workflow = (state) => {
     const dotGithub = state.root['.github'];
     assert(typeof dotGithub === 'object', dotGithub);
     const workflows = dotGithub['workflows'];
@@ -26,6 +25,16 @@ const run = (rust, nodeExtra = () => []) => {
     assert(isVec(file), file);
     return unwrap(parseGitHubAction(jsonParse(utf8ToString(file))));
 };
+const run = (rust, nodeExtra = () => []) => {
+    const [state, result] = virtual(makeState(rust))(ci({ nodeExtra, denoExtra: [], bunExtra: [] }));
+    assert(result === 0, result);
+    return workflow(state);
+};
+const runDefault = (packageJson) => {
+    const [state, result] = virtual(makeState(false, packageJson))(main());
+    assert(result === 0, result);
+    return workflow(state);
+};
 export const proof = {
     rust: () => {
         assert(hasRun('cargo')(run(true)), 'expected Rust steps');
@@ -52,4 +61,47 @@ export const proof = {
             }
         },
     },
+    defaultSetup: {
+        functionalscriptDemo: () => {
+            const gha = runDefault('{"name":"functionalscript"}');
+            assert(hasRun('fjs compile issues/demo/data/tree.json _tree.f.js')(gha), 'expected fjs demo compile');
+            assert(hasRun('fjs t')(gha), 'expected fjs self-test');
+            assert(hasRun('deno task fjs compile issues/demo/data/tree.json _tree.f.js')(gha), 'expected deno demo compile');
+            assert(hasRun('deno task fjs t')(gha), 'expected deno self-test');
+            assert(hasRun('bun ./fs/fjs/module.ts t')(gha), 'expected bun self-test');
+        },
+        otherPackageNoDemo: () => {
+            const gha = runDefault('{"name":"other-package"}');
+            assert(!hasRun('fjs compile issues/demo/data/tree.json _tree.f.js')(gha), 'unexpected fjs demo compile');
+            assert(!hasRun('fjs t')(gha), 'unexpected fjs self-test');
+            assert(!hasRun('deno task fjs compile issues/demo/data/tree.json _tree.f.js')(gha), 'unexpected deno demo compile');
+            assert(!hasRun('deno task fjs t')(gha), 'unexpected deno self-test');
+            assert(!hasRun('bun ./fs/fjs/module.ts t')(gha), 'unexpected bun self-test');
+        },
+        uninstallPackageName: () => {
+            const gha = runDefault('{"name":"other-package"}');
+            assert(hasRun('npm uninstall other-package -g')(gha), 'expected package-specific uninstall');
+            assert(!hasRun('npm uninstall functionalscript -g')(gha), 'unexpected functionalscript uninstall');
+        },
+        malformedPackageJsonFallback: () => {
+            const gha = runDefault('{');
+            assert(!hasRun('fjs compile issues/demo/data/tree.json _tree.f.js')(gha), 'unexpected fjs demo compile');
+            assert(hasRun('npm uninstall functionalscript -g')(gha), 'expected fallback uninstall');
+        },
+        missingPackageJsonFallback: () => {
+            const gha = runDefault();
+            assert(!hasRun('fjs compile issues/demo/data/tree.json _tree.f.js')(gha), 'unexpected fjs demo compile');
+            assert(hasRun('npm uninstall functionalscript -g')(gha), 'expected fallback uninstall');
+        },
+        missingNameFallback: () => {
+            const gha = runDefault('{"version":"1.0.0"}');
+            assert(!hasRun('fjs compile issues/demo/data/tree.json _tree.f.js')(gha), 'unexpected fjs demo compile');
+            assert(hasRun('npm uninstall functionalscript -g')(gha), 'expected fallback uninstall');
+        },
+        nonObjectFallback: () => {
+            const gha = runDefault('[]');
+            assert(!hasRun('fjs compile issues/demo/data/tree.json _tree.f.js')(gha), 'unexpected fjs demo compile');
+            assert(hasRun('npm uninstall functionalscript -g')(gha), 'expected fallback uninstall');
+        },
+    },
 };

package/fs/dev/package_json/module.f.d.ts

@@ -0,0 +1,16 @@
+import type { ValidationError } from '../../types/rtti/validate/module.f.ts';
+import type { Ts } from '../../types/rtti/ts/module.f.ts';
+import { type Result } from '../../types/result/module.f.ts';
+export declare const packageJsonSchema: {
+    readonly name: import("../../types/rtti/module.f.ts").Or<readonly [import("../../types/rtti/module.f.ts").String, undefined]>;
+    readonly version: import("../../types/rtti/module.f.ts").Or<readonly [import("../../types/rtti/module.f.ts").String, undefined]>;
+    readonly scripts: import("../../types/rtti/module.f.ts").Or<readonly [import("../../types/rtti/module.f.ts").Type1<"record", import("../../types/rtti/module.f.ts").String>, undefined]>;
+};
+export type PackageJson = Ts<typeof packageJsonSchema>;
+export type JsonTextError = string | ValidationError;
+export declare const validatePackageJson: import("../../types/rtti/common/module.f.ts").Validate<{
+    readonly name: import("../../types/rtti/module.f.ts").Or<readonly [import("../../types/rtti/module.f.ts").String, undefined]>;
+    readonly version: import("../../types/rtti/module.f.ts").Or<readonly [import("../../types/rtti/module.f.ts").String, undefined]>;
+    readonly scripts: import("../../types/rtti/module.f.ts").Or<readonly [import("../../types/rtti/module.f.ts").Type1<"record", import("../../types/rtti/module.f.ts").String>, undefined]>;
+}>;
+export declare const validatePackageJsonText: (text: string) => Result<PackageJson, JsonTextError>;

package/fs/dev/package_json/module.f.js

@@ -0,0 +1,21 @@
+import { parse as jsonParse } from "../../json/parser/module.f.js";
+import { tokenize as jsonTokenize } from "../../json/tokenizer/module.f.js";
+import { stringToList } from "../../text/utf16/module.f.js";
+import { option, record, string } from "../../types/rtti/module.f.js";
+import { validate as rttiValidate } from "../../types/rtti/validate/module.f.js";
+import { error, ok } from "../../types/result/module.f.js";
+export const packageJsonSchema = {
+    name: option(string),
+    version: option(string),
+    scripts: option(record(string)),
+};
+export const validatePackageJson = rttiValidate(packageJsonSchema);
+const parseJsonText = (text) => jsonParse(jsonTokenize(stringToList(text)));
+export const validatePackageJsonText = (text) => {
+    const [t, v] = parseJsonText(text);
+    if (t === 'error') {
+        return error(v);
+    }
+    const [t2, v2] = validatePackageJson(v);
+    return t2 === 'ok' ? ok(v2) : error(v2);
+};

package/fs/dev/package_json/proof.f.d.ts

@@ -0,0 +1,5 @@
+export declare const proof: {
+    parseMetadata: () => void;
+    malformedJson: () => void;
+    validatePreservesOriginalObject: () => void;
+};

package/fs/dev/package_json/proof.f.js

@@ -0,0 +1,23 @@
+import { assert } from "../../asserts/module.f.js";
+import { unwrap } from "../../types/result/module.f.js";
+import { validatePackageJson, validatePackageJsonText, } from "./module.f.js";
+export const proof = {
+    parseMetadata: () => {
+        const result = unwrap(validatePackageJsonText('{"name":"x","version":"1.0.0","scripts":{"test":"node test.js"}}'));
+        assert(result.name === 'x', result);
+        assert(result.version === '1.0.0', result);
+        assert(result.scripts?.test === 'node test.js', result);
+    },
+    malformedJson: () => {
+        const result = validatePackageJsonText('{');
+        assert(result[0] === 'error', result);
+    },
+    validatePreservesOriginalObject: () => {
+        const object = { name: 'x', version: '1.0.0', private: true };
+        const metadata = unwrap(validatePackageJson(object));
+        assert(metadata.name === 'x', metadata);
+        assert(metadata.version === '1.0.0', metadata);
+        assert(Object.is(metadata, object), metadata);
+        assert(object.private === true, object);
+    },
+};

package/fs/dev/version/module.f.js

@@ -7,21 +7,27 @@ import { utf8, utf8ToString } from "../../text/module.f.js";
 import { begin, pure } from "../../effects/module.f.js";
 import { all, readFile, writeFile } from "../../effects/node/module.f.js";
 import { unwrap } from "../../types/result/module.f.js";
-const { stringify, parse } = JSON;
+import { validatePackageJson } from "../package_json/module.f.js";
+import { assert } from "../../asserts/module.f.js";
+const { parse, stringify } = JSON;
 const jsonFile = (jsonFile) => `${jsonFile}.json`;
 const readJson = (name) => begin
     .step(() => readFile(jsonFile(name)))
-    .step(v => pure(parse(utf8ToString(unwrap(v)))));
+    .step(v => pure(unwrap(validatePackageJson(parse(utf8ToString(unwrap(v)))))));
 const writeVersion = (version) => (name) => begin
     .step(() => readJson(name))
-    .step(json => writeFile(jsonFile(name), utf8(stringify({
+    .step((json) => writeFile(jsonFile(name), utf8(stringify({
     ...json,
     version,
 }, null, 2))));
+const version = (p) => {
+    assert(p.version !== undefined, 'package.json version is missing');
+    return p.version;
+};
 export const updateVersion = begin
     .step(() => readJson('package'))
     .step(p => {
-    const w = writeVersion(p.version);
+    const w = writeVersion(version(p));
     return all(w('package'), w('deno'));
 })
     .step(() => pure(0));

package/package.json

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