Changing import style to .js required extension for ESM

Author: AndrewRayCode

src/ast/ast-types.ts

@@ -4,7 +4,7 @@
  * *AstNode* types where I was lazy or didn't know the core type.
  */
 
-import { Scope } from '../parser/scope';
+import { Scope } from '../parser/scope.js';
 
 // The overall result of parsing, which incldues the AST and scopes
 export interface Program {

src/ast/ast.test.ts

@@ -1,5 +1,10 @@
-import { AstNode, BinaryNode, IdentifierNode, LiteralNode } from './ast-types';
-import { visit } from './visit';
+import {
+  AstNode,
+  BinaryNode,
+  IdentifierNode,
+  LiteralNode,
+} from './ast-types.js';
+import { visit } from './visit.js';
 
 const literal = <T>(literal: T): LiteralNode<T> => ({
   type: 'literal',

src/ast/ast.ts

@@ -1,4 +1,4 @@
-import type { AstNode, Program } from './ast-types';
+import type { AstNode, Program } from './ast-types.js';
 
 type NodeGenerator<NodeType> = (node: NodeType) => string;
 

src/ast/index.ts

@@ -1,3 +1,3 @@
-export * from './ast';
-export * from './visit';
-export * from './ast-types';
+export * from './ast.js';
+export * from './visit.js';
+export * from './ast-types.js';

src/ast/visit.ts

@@ -1,4 +1,4 @@
-import type { AstNode, Program } from './ast-types';
+import type { AstNode, Program } from './ast-types.js';
 
 const isNode = (node: AstNode) => !!node?.type;
 const isTraversable = (node: any) => isNode(node) || Array.isArray(node);

src/index.ts

@@ -1,6 +1,6 @@
-import generate from './parser/generator';
-import parser from './parser/parser';
+import generate from './parser/generator.js';
+import * as parser from './parser/parser.js';
 
-export type * from './error';
+export type * from './error.js';
 
 export { generate, parser };

src/parser/generator.ts

@@ -1,4 +1,8 @@
-import { makeGenerator, makeEveryOtherGenerator, NodeGenerators } from '../ast';
+import {
+  makeGenerator,
+  makeEveryOtherGenerator,
+  NodeGenerators,
+} from '../ast/index.js';
 
 const generators: NodeGenerators = {
   program: (node) => generate(node.wsStart) + generate(node.program),

src/parser/grammar.ts

@@ -16,8 +16,8 @@ import {
   TypeNameNode,
   FullySpecifiedTypeNode,
   TypeSpecifierNode,
-} from '../ast';
-import { ParserOptions } from './parser';
+} from '../ast/index.js';
+import { ParserOptions } from './parser.js';
 import {
   Scope,
   findGlobalScope,
@@ -30,7 +30,7 @@ import {
   isDeclaredType,
   makeScopeIndex,
   findBindingScope,
-} from './scope';
+} from './scope.js';
 
 export {
   Scope,

src/parser/parse.test.ts

@@ -1,6 +1,6 @@
-import { FunctionCallNode, visit } from '../ast';
-import { GlslSyntaxError } from '../error';
-import { buildParser } from './test-helpers';
+import { FunctionCallNode, visit } from '../ast/index.js';
+import { GlslSyntaxError } from '../error.js';
+import { buildParser } from './test-helpers.js';
 
 let c!: ReturnType<typeof buildParser>;
 beforeAll(() => (c = buildParser()));

src/parser/scope.test.ts

@@ -1,7 +1,7 @@
-import generate from './generator';
-import { renameBindings, renameFunctions, renameTypes } from './utils';
-import { UNKNOWN_TYPE } from './grammar';
-import { buildParser, nextWarn } from './test-helpers';
+import generate from './generator.js';
+import { renameBindings, renameFunctions, renameTypes } from './utils.js';
+import { UNKNOWN_TYPE } from './grammar.js';
+import { buildParser, nextWarn } from './test-helpers.js';
 
 let c!: ReturnType<typeof buildParser>;
 beforeAll(() => (c = buildParser()));

src/parser/scope.ts

@@ -9,8 +9,8 @@ import {
   FunctionNode,
   FunctionCallNode,
   TypeNameNode,
-} from '../ast';
-import { xor } from './utils';
+} from '../ast/index.js';
+import { xor } from './utils.js';
 
 export type TypeScopeEntry = {
   declaration?: TypeNameNode;

src/parser/test-helpers.ts

@@ -1,10 +1,10 @@
 import { execSync } from 'child_process';
 import { GrammarError } from 'peggy';
 import util from 'util';
-import generate from './generator';
-import { AstNode, FunctionNode, Program } from '../ast';
-import { Parse, ParserOptions } from './parser';
-import { FunctionScopeIndex, Scope, ScopeIndex } from './scope';
+import generate from './generator.js';
+import { AstNode, FunctionNode, Program } from '../ast/index.js';
+import { Parse, ParserOptions } from './parser.js';
+import { FunctionScopeIndex, Scope, ScopeIndex } from './scope.js';
 
 export const inspect = (arg: any) =>
   console.log(util.inspect(arg, false, null, true));

src/parser/utils.ts

@@ -1,5 +1,5 @@
-import type { AstNode } from '../ast';
-import { Scope } from './scope';
+import type { AstNode } from '../ast/index.js';
+import { Scope } from './scope.js';
 
 export const renameBindings = (
   scope: Scope,

src/preprocessor/generator.ts

@@ -1,6 +1,6 @@
-import { makeGenerator, NodeGenerators } from '../ast';
-import { PreprocessorProgram } from './preprocessor';
-import { PreprocessorAstNode } from './preprocessor-node';
+import { makeGenerator, NodeGenerators } from '../ast/index.js';
+import { PreprocessorProgram } from './preprocessor.js';
+import { PreprocessorAstNode } from './preprocessor-node.js';
 
 type NodeGenerator<NodeType> = (node: NodeType) => string;
 

src/preprocessor/index.ts

@@ -1,13 +1,13 @@
-import generate from './generator';
+import generate from './generator.js';
 import {
   preprocessAst,
   preprocessComments,
   PreprocessorOptions,
-} from './preprocessor';
+} from './preprocessor.js';
 
 // This index file is currently only for package publishing, where the whole
 // library exists in the dist/ folder, so the below import is relative to dist/
-import parser from './preprocessor-parser.js';
+import * as parser from './preprocessor-parser.js';
 
 // Should this be in a separate file? There's no tests for it either
 const preprocess = (src: string, options: PreprocessorOptions) =>

src/preprocessor/preprocessor.test.ts

@@ -5,9 +5,9 @@ import {
   preprocessComments,
   preprocessAst,
   PreprocessorProgram,
-} from './preprocessor';
-import generate from './generator';
-import { GlslSyntaxError } from '../error';
+} from './preprocessor.js';
+import generate from './generator.js';
+import { GlslSyntaxError } from '../error.js';
 
 const fileContents = (filePath: string): string =>
   fs.readFileSync(filePath).toString();

src/preprocessor/preprocessor.ts

@@ -1,12 +1,12 @@
-import { NodeVisitor, Path, visit } from '../ast/visit';
+import { NodeVisitor, Path, visit } from '../ast/visit.js';
 import {
   PreprocessorAstNode,
   PreprocessorElseIfNode,
   PreprocessorIdentifierNode,
   PreprocessorIfNode,
   PreprocessorLiteralNode,
   PreprocessorSegmentNode,
-} from './preprocessor-node';
+} from './preprocessor-node.js';
 
 export type PreprocessorProgram = {
   type: string;

tsconfig.json

@@ -9,14 +9,16 @@
     "lib": ["ESNext"],
 
     // Create ESM modules
-    "module": "esnext",
+    "module": "NodeNext",
     // Specify multiple folders that act like `./node_modules/@types`
     "typeRoots": [
       "node_modules/@types",
       "./preprocessor",
       "./parser"
-      ],          
-      
+    ],
+
+    "moduleResolution": "NodeNext",
+
     // Generate .d.ts files from TypeScript and JavaScript files in your project
     "declaration": true,
     // Specify an output folder for all emitted files.