functionalscript 0.36.0 → 0.38.0

package/{fs → fjs}/dev/package_json/proof.f.js

@@ -1,12 +1,12 @@
-import { assert } from "../../asserts/module.f.js";
-import { unwrap } from "../../types/result/module.f.js";
-import { validatePackageJson, validatePackageJsonText, } from "./module.f.js";
+import { assert, assertEq } 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);
+        assertEq(result.name, 'x', result);
+        assertEq(result.version, '1.0.0', result);
+        assertEq(result.scripts?.test, 'node test.js', result);
     },
     malformedJson: () => {
         const result = validatePackageJsonText('{');
@@ -20,9 +20,9 @@ export const proof = {
     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);
+        assertEq(metadata.name, 'x', metadata);
+        assertEq(metadata.version, '1.0.0', metadata);
         assert(Object.is(metadata, object), metadata);
-        assert(object.private === true, object);
+        assertEq(object.private, true, object);
     },
 };

package/{fs → fjs}/dev/proof.f.js

@@ -1,5 +1,5 @@
-import { assert, todo } from "../asserts/module.f.js";
-import { shouldLoad } from "./module.f.js";
+import { assert, assertEq, todo } from '../asserts/module.f.js';
+import { shouldLoad } from './module.f.js';
 export const proof = {
     shouldLoad: () => {
         assert(shouldLoad('foo.f.ts'));
@@ -18,9 +18,7 @@ export const proof = {
         const c = (() => { })['constructor'];
         const f = c('return 5');
         const result = f();
-        if (result !== 5) {
-            throw 'function';
-        }
+        assertEq(result, 5, 'function');
     },
     ctorEmpty: () => {
         /** @type {any} */

package/{fs → fjs}/djs/ast/module.f.js

@@ -1,5 +1,5 @@
-import { concat, fold, last, map, take, toArray } from "../../types/list/module.f.js";
-import { fromEntries } from "../../types/object/module.f.js";
+import { concat, fold, last, map, take, toArray } from '../../types/list/module.f.js';
+import { fromEntries } from '../../types/object/module.f.js';
 const { entries } = Object;
 const foldOp = ast => state => {
     const djs = toDjs(state)(ast);

package/{fs → fjs}/djs/ast/proof.f.js

@@ -1,35 +1,27 @@
-import { sort } from "../../types/object/module.f.js";
-import { run } from "./module.f.js";
-import { stringifyAsTree } from "../serializer/module.f.js";
-import { assertEq } from "../../asserts/module.f.js";
+import { sort } from '../../types/object/module.f.js';
+import { run } from './module.f.js';
+import { stringifyAsTree } from '../serializer/module.f.js';
+import { assertEq } from '../../asserts/module.f.js';
 export const proof = {
     test: () => {
         const djs = run([1])([]);
         const result = stringifyAsTree(sort)(djs);
-        if (result !== '1') {
-            throw result;
-        }
+        assertEq(result, '1');
     },
     testCref: () => {
         const djs = run([1, 2, 3, 4, 5, ['cref', 3]])([11, 12, 13, 14, 15]);
         const result = stringifyAsTree(sort)(djs);
-        if (result !== '4') {
-            throw result;
-        }
+        assertEq(result, '4');
     },
     testAref: () => {
         const djs = run([1, 2, 3, 4, 5, ['aref', 3]])([11, 12, 13, 14, 15]);
         const result = stringifyAsTree(sort)(djs);
-        if (result !== '14') {
-            throw result;
-        }
+        assertEq(result, '14');
     },
     testArray: () => {
         const djs = run([1, 2, 3, 4, 5, ['array', [['aref', 3], ['cref', 3]]]])([11, 12, 13, 14, 15]);
         const result = stringifyAsTree(sort)(djs);
-        if (result !== '[14,4]') {
-            throw result;
-        }
+        assertEq(result, '[14,4]');
     },
     testObj: () => {
         const djs = run([1, 2, 3, 4, 5, { "key": { "key2": ['array', [['aref', 3], ['cref', 3]]] } }])([11, 12, 13, 14, 15]);

package/fjs/djs/examples/m.f.d.ts

@@ -0,0 +1,2 @@
+declare const _default = "text";
+export default _default;

package/{fs → fjs}/djs/module.f.d.ts

@@ -3,7 +3,7 @@
  *
  * @module
  */
-import type { Primitive as JsonPrimitive } from '../json/module.f.ts';
+import type { Primitive as JsonPrimitive } from '../media/json/module.f.ts';
 import { type Effect } from '../effects/module.f.ts';
 import { type WriteFile, type ReadFile, type Write } from '../effects/node/module.f.ts';
 export type Object = {

package/{fs → fjs}/djs/module.f.js

@@ -1,8 +1,8 @@
-import { transpile } from "./transpiler/module.f.js";
-import { stringify, stringifyAsTree } from "./serializer/module.f.js";
-import { sort } from "../types/object/module.f.js";
-import { pure } from "../effects/module.f.js";
-import { writeUtf8File, error, } from "../effects/node/module.f.js";
+import { transpile } from './transpiler/module.f.js';
+import { stringify, stringifyAsTree } from './serializer/module.f.js';
+import { sort } from '../types/object/module.f.js';
+import { pure } from '../effects/module.f.js';
+import { writeUtf8File, error, } from '../effects/node/module.f.js';
 export const compile = args => {
     if (args.length < 2) {
         return error('Error: Requires 2 or more arguments')

package/{fs → fjs}/djs/parser/module.f.d.ts

@@ -13,3 +13,8 @@ export type ParseError = {
     readonly metadata: TokenMetadata | null;
 };
 export declare const parseFromTokens: (tokenList: List<DjsTokenWithMetadata>) => Result<AstModule, ParseError>;
+export declare const proof: {
+    pushKey: {
+        nonObjectTop: () => void;
+    };
+};

package/{fs → fjs}/djs/parser/module.f.js

@@ -3,10 +3,11 @@
  *
  * @module
  */
-import { error, ok } from "../../types/result/module.f.js";
-import { fold, first, drop, toArray, length, concat } from "../../types/list/module.f.js";
-import { setReplace, at } from "../../types/ordered_map/module.f.js";
-import { fromMap } from "../../types/object/module.f.js";
+import { error, ok } from '../../types/result/module.f.js';
+import { fold, first, drop, toArray, length, concat } from '../../types/list/module.f.js';
+import { setReplace, at } from '../../types/ordered_map/module.f.js';
+import { fromMap } from '../../types/object/module.f.js';
+import { assertEq } from '../../asserts/module.f.js';
 const parseInitialOp = ({ token, metadata }) => state => {
     switch (token.kind) {
         case 'ws':
@@ -361,3 +362,22 @@ export const parseFromTokens = (tokenList) => {
         default: return error({ message: 'unexpected end', metadata: null });
     }
 };
+export const proof = {
+    pushKey: {
+        // `pushKey` is only ever invoked while `state.top` is an object (the
+        // `'{'`/`'{,'` value-states guarantee it), so its non-object guard is
+        // a defensive branch unreachable through `parseFromTokens`. Call it
+        // directly to cover that branch.
+        nonObjectTop: () => {
+            const state = {
+                state: 'exportValue',
+                module: { refs: null, modules: null, consts: null },
+                valueState: '[',
+                top: null,
+                stack: null,
+            };
+            const result = pushKey(state)('key')({ path: 'test', line: 0, column: 0 });
+            assertEq(result.state, 'error');
+        },
+    },
+};