Skip to content

Commit fe8168c

Browse files
fix(build): add .js extensions for ES module compatibility
1 parent 6055316 commit fe8168c

File tree

12 files changed

+38
-50
lines changed

12 files changed

+38
-50
lines changed

main.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import Parser from "./src/parser/parser";
2-
import { createGlobalEnv } from "./src/runtime/environment";
3-
import { evaluate } from "./src/runtime/interpreter";
1+
import Parser from "./src/parser/parser.js";
2+
import { createGlobalEnv } from "./src/runtime/environment.js";
3+
import { evaluate } from "./src/runtime/interpreter.js";
44
repl();
55

66
// Run time //

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jistscript",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"description": "A TypeScript-based scripting language engineered for data-centric applications, driven by robust data processing capabilities.",
55
"type": "module",
66
"main": "./dist/index.js",

src/cli/jistc.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { parseArgs } from "node:util";
22
import { readFileSync, writeFileSync, existsSync, mkdirSync } from "node:fs";
33
import { join, dirname, relative } from "node:path";
44
import { glob } from "glob";
5-
import Parser from "../parser/parser";
6-
import { transpileToJS } from "../compiler/transpiler";
7-
import { watch } from "./watch";
5+
import Parser from "../parser/parser.js";
6+
import { transpileToJS } from "../compiler/transpiler.js";
7+
import { watch } from "./watch.js";
88

99
interface CompilerOptions {
1010
outDir?: string;

src/compiler/transpiler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
ArrayLiteral,
1212
AssignmentExpr,
1313
TypeAnnotation,
14-
} from "../parser/typeAst";
14+
} from "../parser/typeAst.js";
1515

1616
interface TranspileOptions {
1717
target?: "es5" | "es6" | "esnext";

src/index.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
export { default as Parser } from "./parser/parser";
2-
export { tokenize, TokenType } from "./parser/lexer";
3-
export type { Token } from "./parser/lexer";
4-
export { evaluate } from "./runtime/interpreter";
5-
export { createGlobalEnv } from "./runtime/environment";
6-
export { default as Environment } from "./runtime/environment";
1+
export { default as Parser } from "./parser/parser.js";
2+
export { tokenize, TokenType } from "./parser/lexer.js";
3+
export type { Token } from "./parser/lexer.js";
4+
export { evaluate } from "./runtime/interpreter.js";
5+
export { createGlobalEnv } from "./runtime/environment.js";
6+
export { default as Environment } from "./runtime/environment.js";
77

88
// Export types //
9-
export type * from "./parser/typeAst";
10-
export type * from "./runtime/values";
9+
export type * from "./parser/typeAst.js";
10+
export type * from "./runtime/values.js";
1111

1212
// Compiler //
13-
export { transpileToJS } from "./compiler/transpiler";
13+
export { transpileToJS } from "./compiler/transpiler.js";
1414

1515
// Main API //
1616
export class JistScript {}

src/parser/parser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import {
1515
StringLiteral,
1616
ArrayLiteral,
1717
TypeAnnotation,
18-
} from "./typeAst";
19-
import { tokenize, Token, TokenType } from "./lexer";
18+
} from "./typeAst.js";
19+
import { tokenize, Token, TokenType } from "./lexer.js";
2020

2121
export default class Parser {
2222
private tokens: Token[] = [];

src/plugins/vite-plugin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Plugin } from "vite";
2-
import Parser from "../parser/parser";
3-
import { transpileToJS } from "../compiler/transpiler";
2+
import Parser from "../parser/parser.js";
3+
import { transpileToJS } from "../compiler/transpiler.js";
44

55
export function jistscript(): Plugin {
66
return {

src/runtime/environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
NEW_ARRAY,
88
StateTypeInfo,
99
validateStateType,
10-
} from "./values";
10+
} from "./values.js";
1111

1212
// Global state counter for useState //
1313
let stateIdCounter = 0;

src/runtime/eval/evalStatements.ts

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,18 @@
11
import { RuntimeVal, NEW_NULL, FunctionVal } from "../values";
2-
import {
3-
FunctionDeclaration,
4-
Program,
5-
VarDeclaration,
6-
} from "../../parser/typeAst";
7-
import Environment from "../environment";
8-
import { evaluate } from "../interpreter";
2+
import { FunctionDeclaration, Program, VarDeclaration } from "../../parser/typeAst.js";
3+
import Environment from "../environment.js";
4+
import { evaluate } from "../interpreter.js";
95

10-
export function eval_program_expr(
11-
program: Program,
12-
env: Environment
13-
): RuntimeVal {
6+
export function eval_program_expr(program: Program, env: Environment): RuntimeVal {
147
let lastEvaluated: RuntimeVal = NEW_NULL();
158
for (const statements of program.body) {
169
lastEvaluated = evaluate(statements, env);
1710
}
1811
return lastEvaluated;
1912
}
2013

21-
export function eval_var_declaration(
22-
declaration: VarDeclaration,
23-
env: Environment
24-
): RuntimeVal {
25-
const value = declaration.value
26-
? evaluate(declaration.value, env)
27-
: NEW_NULL();
14+
export function eval_var_declaration(declaration: VarDeclaration, env: Environment): RuntimeVal {
15+
const value = declaration.value ? evaluate(declaration.value, env) : NEW_NULL();
2816
return env.declareVar(declaration.identifier, value, declaration.constant);
2917
}
3018

src/runtime/eval/expressions.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import {
44
BinaryExpr,
55
Identifier,
66
ObjectLiteral,
7-
} from "../../parser/typeAst";
8-
import Environment from "../environment";
9-
import { evaluate } from "../interpreter";
10-
import { NEW_NULL, NumberVal, RuntimeVal, ArrayVal, ObjectVal } from "../values";
7+
} from "../../parser/typeAst.js";
8+
import Environment from "../environment.js";
9+
import { evaluate } from "../interpreter.js";
10+
import { NEW_NULL, NumberVal, RuntimeVal, ArrayVal, ObjectVal } from "../values.js";
1111

1212
export function eval_array_literal(astNode: ArrayLiteral, env: Environment): ArrayVal {
1313
const elements = astNode.elements.map(element => evaluate(element, env));

0 commit comments

Comments
 (0)