functionalscript 0.32.4 → 0.34.0

package/fs/djs/parser/module.f.d.ts

@@ -6,13 +6,8 @@
 import { type Result } from '../../types/result/module.f.ts';
 import { type List } from '../../types/list/module.f.ts';
 import type { DjsTokenWithMetadata } from '../tokenizer/module.f.ts';
-import { type OrderedMap } from '../../types/ordered_map/module.f.ts';
 import type { AstModule } from '../ast/module.f.ts';
 import type { TokenMetadata } from '../../js/tokenizer/module.f.ts';
-export type ParseContext = {
-    readonly complete: OrderedMap<Result<AstModule, string>>;
-    readonly stack: List<string>;
-};
 export type ParseError = {
     readonly message: string;
     readonly metadata: TokenMetadata | null;

package/fs/djs/proof.f.js

@@ -1,13 +1,12 @@
 import { compile } from "./module.f.js";
 import { virtual, emptyState } from "../effects/node/virtual/module.f.js";
-import { isVec } from "../types/bit_vec/module.f.js";
 import { utf8, utf8ToString } from "../text/module.f.js";
 const readOutput = (root, path) => {
     const file = root[path];
-    if (!isVec(file)) {
+    if (!Array.isArray(file) || file.length === 0) {
         throw `${path} is not a file`;
     }
-    return utf8ToString(file);
+    return utf8ToString(file[0]);
 };
 export const proof = {
     tooFewArgs: {
@@ -31,7 +30,7 @@ export const proof = {
         },
     },
     success: () => {
-        const root = { 'input.f.js': utf8('export default 42') };
+        const root = { 'input.f.js': [utf8('export default 42')] };
         const [state, code] = virtual({ ...emptyState, root })(compile(['input.f.js', 'output.f.js']));
         if (code !== 0) {
             throw code;
@@ -42,7 +41,7 @@ export const proof = {
         }
     },
     jsonOutput: () => {
-        const root = { 'input.f.js': utf8('export default 42') };
+        const root = { 'input.f.js': [utf8('export default 42')] };
         const [state, code] = virtual({ ...emptyState, root })(compile(['input.f.js', 'output.json']));
         if (code !== 0) {
             throw code;
@@ -62,7 +61,7 @@ export const proof = {
         }
     },
     parseError: () => {
-        const root = { 'bad.f.js': utf8('export default @') };
+        const root = { 'bad.f.js': [utf8('export default @')] };
         const [state, code] = virtual({ ...emptyState, root })(compile(['bad.f.js', 'output.f.js']));
         if (code !== 0) {
             throw code;

package/fs/djs/serializer/module.f.d.ts

@@ -8,9 +8,7 @@ import type { Entry as ObjectEntry } from '../../types/object/module.f.ts';
 import { type List } from '../../types/list/module.f.ts';
 export declare const undefinedSerialize: string[];
 type RefCounter = readonly [number, number];
-type Entry = ObjectEntry<Unknown>;
-type Entries = List<Entry>;
-type MapEntries = (entries: Entries) => Entries;
+type MapEntries = (entries: List<ObjectEntry<Unknown>>) => List<ObjectEntry<Unknown>>;
 type Refs = ReadonlyMap<Unknown, RefCounter>;
 export declare const serializeWithoutConst: (mapEntries: MapEntries) => (value: Unknown) => List<string>;
 export declare const stringify: (sort: MapEntries) => (djs: Unknown) => string;

package/fs/djs/tokenizer-new/module.f.js

@@ -3,7 +3,7 @@
  *
  * @module
  */
-import { descentParser } from "../../bnf/data/module.f.js";
+import { descentParser } from "../../bnf/descent/module.f.js";
 import { eof, join0Plus, max, none, not, notSet, oneEncode, option, range, remove, repeat, repeat0Plus, repeat1Plus, set, unicodeRange } from "../../bnf/module.f.js";
 import { todo } from "../../asserts/module.f.js";
 export const parse = (input) => {
@@ -20,7 +20,8 @@ export const jsGrammar = () => {
             escape: [
                 '\\',
                 {
-                    ...set('"\\/bfnrt'),
+                    ...set('"\\bfnrt'),
+                    solidus: '/',
                     u: [
                         'u',
                         ...repeat(4)({

package/fs/djs/tokenizer-new/proof.f.d.ts

@@ -3,6 +3,9 @@ export declare const proof: {
     tokenizer: (() => void)[];
     djs: (() => void)[];
     operators: (() => void)[];
+    ws: (() => void)[];
+    id: (() => void)[];
+    keywords: (() => void)[];
     throw: {
         parse: () => void;
     };