functionalscript 0.4.4 → 0.5.0

package/djs/module.f.d.ts

@@ -1,3 +1,4 @@
+import type { Io } from '../io/module.f.ts';
 import type { Primitive as JsonPrimitive } from '../json/module.f.ts';
 export type Object = {
     readonly [k in string]: Unknown;
@@ -5,3 +6,4 @@ export type Object = {
 export type Array = readonly Unknown[];
 export type Primitive = JsonPrimitive | bigint | undefined;
 export type Unknown = Primitive | Object | Array;
+export declare const run: ({ console: { error }, fs, process: { argv } }: Io) => void;

package/djs/module.f.js

@@ -1 +1,25 @@
-export {};
+import { transpile } from "./transpiler/module.f.js";
+import { stringify } from "./serializer/module.f.js";
+import { sort } from "../types/object/module.f.js";
+const stringifyUnknown = stringify(sort);
+export const run = ({ console: { error }, fs, process: { argv } }) => {
+    const args = argv.slice(2);
+    if (args.length < 2) {
+        error('Error: Requires 2 or more arguments');
+        return;
+    }
+    const inputFileName = args[0];
+    const outputFileName = args[1];
+    const result = transpile(fs)(inputFileName);
+    switch (result[0]) {
+        case 'ok': {
+            const output = stringifyUnknown(result[1]);
+            fs.writeFileSync(outputFileName, output);
+            break;
+        }
+        case 'error': {
+            error(`Parse error: ${result[1]}`);
+            break;
+        }
+    }
+};

package/djs/transpiler/module.f.js

@@ -15,7 +15,8 @@ const mapDjs = context => path => {
 };
 const transpileWithImports = path => parseModuleResult => context => {
     if (parseModuleResult[0] === 'ok') {
-        const pathsCombine = listMap(pathConcat(path))(parseModuleResult[1][0]);
+        const dir = pathConcat(path)('..');
+        const pathsCombine = listMap(pathConcat(dir))(parseModuleResult[1][0]);
         const contextWithImports = fold(foldNextModuleOp)({ ...context, stack: { first: path, tail: context.stack } })(pathsCombine);
         if (contextWithImports.error !== null) {
             return contextWithImports;

package/djs/transpiler/test.f.js

@@ -20,10 +20,10 @@ export default {
         }
     },
     parseWithSubModule: () => {
-        const map = setReplace('a')('import b from "b"\nexport default b')(null);
-        const map2 = setReplace('a/b')('export default 2')(map);
+        const map = setReplace('a/b')('import c from "c"\nexport default c')(null);
+        const map2 = setReplace('a/c')('export default 2')(map);
         const fs = virtualFs(map2);
-        const result = transpile(fs)('a');
+        const result = transpile(fs)('a/b');
         if (result[0] === 'error') {
             throw result[1];
         }
@@ -34,9 +34,9 @@ export default {
     },
     parseWithSubModules: () => {
         const map = setReplace('a')('import b from "b"\nimport c from "c"\nexport default [b,c,b]')(null);
-        const map2 = setReplace('a/b')('import d from "../d"\nexport default [0,d]')(map);
-        const map3 = setReplace('a/c')('import d from "../d"\nexport default [1,d]')(map2);
-        const map4 = setReplace('a/d')('export default 2')(map3);
+        const map2 = setReplace('b')('import d from "d"\nexport default [0,d]')(map);
+        const map3 = setReplace('c')('import d from "d"\nexport default [1,d]')(map2);
+        const map4 = setReplace('d')('export default 2')(map3);
         const fs = virtualFs(map4);
         const result = transpile(fs)('a');
         if (result[0] === 'error') {
@@ -60,8 +60,8 @@ export default {
     },
     parseWithCycleError: () => {
         const map = setReplace('a')('import b from "b"\nimport c from "c"\nexport default [b,c,b]')(null);
-        const map2 = setReplace('a/b')('import c from "../c"\nexport default c')(map);
-        const map3 = setReplace('a/c')('import b from "../b"\nexport default b')(map2);
+        const map2 = setReplace('b')('import c from "c"\nexport default c')(map);
+        const map3 = setReplace('c')('import b from "b"\nexport default b')(map2);
         const fs = virtualFs(map3);
         const result = transpile(fs)('a');
         if (result[0] !== 'error') {

package/fsc.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+import io from "./io/node-io.js";
+import { run } from "./djs/module.f.js";
+run(io);

package/io/module.f.d.ts

@@ -5,8 +5,13 @@ export type Fs = {
 };
 export type Console = {
     readonly log: (...d: unknown[]) => void;
+    readonly error: (...d: unknown[]) => void;
 };
 export type Io = {
     readonly console: Console;
     readonly fs: Fs;
+    readonly process: Process;
+};
+export type Process = {
+    readonly argv: string[];
 };

package/io/node-io.js

@@ -0,0 +1,7 @@
+import fs from 'node:fs';
+import process from "node:process";
+export default {
+    console,
+    fs,
+    process
+};

package/io/virtual-io.f.js

@@ -1,10 +1,14 @@
 import { at } from "../types/map/module.f.js";
 export const createVirtualIo = (files) => ({
     console: {
-        log: (..._d) => { }
+        log: (..._d) => { },
+        error: (..._d) => { }
     },
     fs: {
         writeFileSync: (_file, _data) => { },
         readFileSync: (path, _options) => { return at(path)(files); }
+    },
+    process: {
+        argv: []
     }
 });

package/package.json

@@ -1,23 +1,30 @@
 {
   "name": "functionalscript",
-  "version": "0.4.4",
+  "version": "0.5.0",
   "type": "module",
   "files": [
+    "fsc.js",
+    "io/node-io.js",
     "**/*.f.d.ts",
     "**/*.f.js"
   ],
   "description": "FunctionalScript is a functional subset of JavaScript",
   "scripts": {
     "tsc-emit": "tsc --NoEmit false",
+    "n": "node --frozen-intrinsics --trace-uncaught",
     "prepack": "npm run tsc-emit",
-    "test20": "npm run prepack && node --trace-uncaught ./dev/test.js",
-    "test22": "tsc && node --experimental-strip-types --trace-uncaught ./dev/test.ts",
-    "test": "tsc && node --trace-uncaught ./dev/test.ts",
-    "index": "node ./dev/index.ts",
-    "version": "node ./nodejs/version/main.ts",
-    "fsc": "node ./main.ts",
+    "git-clean": "git clean -xf",
+    "test20": "npm run tsc-emit && npm run n ./dev/test.js",
+    "test22": "tsc && npm run n -- --experimental-strip-types ./dev/test.ts",
+    "test": "tsc && npm run n ./dev/test.ts",
+    "index": "npm run n ./dev/index.ts",
+    "version": "npm run n ./nodejs/version/main.ts",
+    "fsc": "npm run n ./fsc.ts",
     "update": "npm run version && npm run index && npm install"
   },
+  "bin": {
+    "fsc": "fsc.js"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/functionalscript/functionalscript.git"
@@ -38,7 +45,7 @@
   },
   "homepage": "https://github.com/functionalscript/functionalscript#readme",
   "devDependencies": {
-    "@types/node": "^22.13.4",
-    "typescript": "^5.7.3"
+    "@types/node": "^22.13.10",
+    "typescript": "^5.8.2"
   }
 }

package/path/module.f.js

@@ -1,4 +1,3 @@
-import {} from "../types/function/operator/module.f.js";
 import { fold, last, take, length, concat as listConcat } from "../types/list/module.f.js";
 import { join } from "../types/string/module.f.js";
 import { concat as stringConcat } from "../types/string/module.f.js";
@@ -13,10 +12,8 @@ const foldNormalizeOp = input => state => {
                 case '..': {
                     return listConcat(state)([input]);
                 }
-                default: {
-                    return take(length(state) - 1)(state);
-                }
             }
+            return take(length(state) - 1)(state);
         }
         default: {
             return listConcat(state)([input]);
@@ -24,7 +21,7 @@ const foldNormalizeOp = input => state => {
     }
 };
 export const normalize = path => {
-    const split = path.split('/');
+    const split = path.replaceAll('\\', '/').split('/');
     const foldResult = fold(foldNormalizeOp)([])(split);
     return join('/')(foldResult);
 };