Improved bundle splitting (#62)

* Improved bundle splitting

* Added import prefix

package.json

@@ -10,7 +10,7 @@
   "description": "Access the RONIN data platform via TypeScript.",
   "scripts": {
     "dev": "bun run build -- --watch",
-    "build": "tsc --build",
+    "build": "tsup ./src/index.ts ./src/bin/index.ts ./src/utils/index.ts --format esm",
     "test": "bun test",
     "lint": "bun run lint:tsc && bun run lint:eslint --",
     "lint:eslint": "eslint . --ext .ts --ignore-path .gitignore",
@@ -90,6 +90,7 @@
     "husky": "9.0.11",
     "lint-staged": "15.2.5",
     "prettier": "3.3.1",
+    "tsup": "8.1.0",
     "typescript": "5.4.5"
   }
 }

src/bin/commands/login.ts

@@ -3,7 +3,7 @@ import http from 'http';
 import open from 'open';
 import ora from 'ora';
 
-import { storeSession, storeTokenForBun, storeTokenForNPM } from '../utils/session';
+import { storeSession, storeTokenForBun, storeTokenForNPM } from '@/src/bin/utils/session';
 
 export default async (appToken?: string) => {
   const spinner = ora('Logging in').start();

src/bin/index.ts

@@ -2,10 +2,10 @@
 
 import { parseArgs } from 'util';
 
-import { printHelp, printVersion } from '../bin/utils/info';
-import initializeProject from './commands/init';
-import logIn from './commands/login';
-import { getSession } from './utils/session';
+import initializeProject from '@/src/bin/commands/init';
+import logIn from '@/src/bin/commands/login';
+import { printHelp, printVersion } from '@/src/bin/utils/info';
+import { getSession } from '@/src/bin/utils/session';
 
 let values;
 let positionals;

src/bin/utils/info.ts

@@ -1,6 +1,6 @@
 import chalkTemplate from 'chalk-template';
 
-import { version } from '../../../package.json';
+import { version } from '@/src/../package.json';
 
 export const printVersion = () => {
   console.log(version);

src/index.ts

@@ -1,7 +1,7 @@
-import { createSyntaxFactory } from './syntax';
+import { createSyntaxFactory } from '@/src/syntax';
 
 const { create, get, set, drop, count, batch } = createSyntaxFactory({});
 
 export { create, get, set, drop, count, batch };
-export type { RONIN } from './types/codegen';
+export type { RONIN } from '@/src/types/codegen';
 export default createSyntaxFactory;

src/queries.ts

@@ -1,9 +1,9 @@
-import { processStorableObjects, uploadStorableObjects } from './storage';
-import type { Query, Results } from './types/query';
-import type { QueryHandlerOptions } from './types/utils';
-import { runQueriesWithHooks } from './utils/data-hooks';
-import { getDotNotatedPath, InvalidQueryError } from './utils/errors';
-import { formatTimeFields, getProperty } from './utils/helpers';
+import { processStorableObjects, uploadStorableObjects } from '@/src/storage';
+import type { Query, Results } from '@/src/types/query';
+import type { QueryHandlerOptions } from '@/src/types/utils';
+import { runQueriesWithHooks } from '@/src/utils/data-hooks';
+import { getDotNotatedPath, InvalidQueryError } from '@/src/utils/errors';
+import { formatTimeFields, getProperty } from '@/src/utils/helpers';
 
 type QueryResponse<T> = {
   results: Result<T>[];

src/storage.ts

@@ -1,6 +1,6 @@
-import type { CombinedInstructions, Query } from './types/query';
-import type { StorableObject, StoredObject } from './types/storage';
-import type { QueryHandlerOptions } from './types/utils';
+import type { CombinedInstructions, Query } from '@/src/types/query';
+import type { StorableObject, StoredObject } from '@/src/types/storage';
+import type { QueryHandlerOptions } from '@/src/types/utils';
 
 /**
  * Extract `StorableObject`s from queries. These will be uploaded separately

src/syntax/handlers.ts

@@ -1,6 +1,6 @@
-import { runQueriesWithStorageAndHooks } from '../queries';
-import type { Query } from '../types/query';
-import type { QueryHandlerOptionsFactory } from '../types/utils';
+import { runQueriesWithStorageAndHooks } from '@/src/queries';
+import type { Query } from '@/src/types/query';
+import type { QueryHandlerOptionsFactory } from '@/src/types/utils';
 
 /**
  * Executes an array of queries and handles their results. It is used to execute

src/syntax/index.ts

@@ -1,7 +1,7 @@
-import type { RONIN } from '../types/codegen';
-import type { QueryHandlerOptionsFactory } from '../types/utils';
-import { queriesHandler, queryHandler } from './handlers';
-import { getBatchProxy, getSyntaxProxy } from './utils';
+import { queriesHandler, queryHandler } from '@/src/syntax/handlers';
+import { getBatchProxy, getSyntaxProxy } from '@/src/syntax/utils';
+import type { RONIN } from '@/src/types/codegen';
+import type { QueryHandlerOptionsFactory } from '@/src/types/utils';
 
 /**
  * Creates a syntax factory for generating and executing queries.

src/syntax/utils.ts

@@ -1,6 +1,6 @@
-import type { Query } from '../types/query';
-import type { PromiseTuple } from '../types/utils';
-import { objectFromAccessor } from '../utils/helpers';
+import type { Query } from '@/src/types/query';
+import type { PromiseTuple } from '@/src/types/utils';
+import { objectFromAccessor } from '@/src/utils/helpers';
 
 let inBatch = false;
 

src/types/codegen.ts

@@ -1,5 +1,5 @@
-import type { StorableObjectValue, StoredObject } from './storage';
-import type { ReducedFunction, ReplaceRecursively } from './utils';
+import type { StorableObjectValue, StoredObject } from '@/src/types/storage';
+import type { ReducedFunction, ReplaceRecursively } from '@/src/types/utils';
 
 export namespace RONIN {
   export interface RoninRecord<TId extends string = string> {

src/types/index.ts

@@ -28,7 +28,7 @@ export type {
   BeforeHookHandler,
   AfterHookHandler,
   DuringHookHandler,
-} from '../utils/data-hooks';
+} from '@/src/utils/data-hooks';
 
 export type {
   // Queries
@@ -56,7 +56,7 @@ export type {
 
   // Query Instructions
   WithInstruction,
-} from './query';
+} from '@/src/types/query';
 
 // Storage
-export type { StorableObjectValue, StoredObject } from './storage';
+export type { StorableObjectValue, StoredObject } from '@/src/types/storage';

src/types/utils.ts

@@ -1,4 +1,4 @@
-import type { Hooks } from '../utils/data-hooks';
+import type { Hooks } from '@/src/utils/data-hooks';
 
 export interface QueryHandlerOptions {
   /**

src/utils/data-hooks.ts

@@ -1,9 +1,9 @@
 import type AsyncHooks from 'node:async_hooks';
 
-import { runQueries } from '../queries';
-import type { CombinedInstructions, Query, QuerySchemaType, QueryType, Results } from '../types/query';
-import type { QueryHandlerOptions, RecursivePartial } from '../types/utils';
-import { toDashCase } from './helpers';
+import { runQueries } from '@/src/queries';
+import type { CombinedInstructions, Query, QuerySchemaType, QueryType, Results } from '@/src/types/query';
+import type { QueryHandlerOptions, RecursivePartial } from '@/src/types/utils';
+import { toDashCase } from '@/src/utils/helpers';
 
 const EMPTY = Symbol('empty');
 

src/utils/index.ts

@@ -1,5 +1,5 @@
-import { runQueriesWithStorageAndHooks as runQueries } from '../queries';
-import { processStorableObjects } from '../storage';
-import { getBatchProxy, getSyntaxProxy } from '../syntax/utils';
+import { runQueriesWithStorageAndHooks as runQueries } from '@/src/queries';
+import { processStorableObjects } from '@/src/storage';
+import { getBatchProxy, getSyntaxProxy } from '@/src/syntax/utils';
 
 export { runQueries, processStorableObjects, getSyntaxProxy, getBatchProxy };

tests/integration/edge.test.ts

@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, mock, spyOn, test } from 'bun:test';
 
-import createSyntaxFactory from '../../src';
-import { runQueriesWithHooks } from '../../src/utils/data-hooks';
+import createSyntaxFactory from '@/src/index';
+import { runQueriesWithHooks } from '@/src/utils/data-hooks';
 
 const mockFetch = mock(async () => {
   return Response.json({

tests/integration/factory.test.ts

@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, mock, test } from 'bun:test';
 
-import { createSyntaxFactory } from '../../src/syntax';
-import type { StoredObject } from '../../src/types/storage';
+import { createSyntaxFactory } from '@/src/syntax';
+import type { StoredObject } from '@/src/types/storage';
 
 let mockRequestResolvedValue: Request | undefined = undefined;
 let mockResolvedRequestText: any = undefined;

tests/integration/hooks.test.ts

@@ -1,8 +1,8 @@
 import { beforeEach, describe, expect, mock, test } from 'bun:test';
 
-import { createSyntaxFactory } from '../../src/syntax';
-import type { CombinedInstructions, QueryType } from '../../src/types/query';
-import { type FilteredHookQuery, runQueriesWithHooks } from '../../src/utils/data-hooks';
+import { createSyntaxFactory } from '@/src/syntax';
+import type { CombinedInstructions, QueryType } from '@/src/types/query';
+import { type FilteredHookQuery, runQueriesWithHooks } from '@/src/utils/data-hooks';
 
 let mockResolvedRequestText: any = undefined;
 

tests/unit/error.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'bun:test';
 
-import { getDotNotatedPath } from '../../src/utils/errors';
+import { getDotNotatedPath } from '@/src/utils/errors';
 
 describe('generate dot notation', () => {
   test('generate path from segments containing only strings', () => {

tests/unit/queries.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, mock, spyOn, test } from 'bun:test';
 
-import { queriesHandler } from '../../src/syntax/handlers';
+import { queriesHandler } from '@/src/syntax/handlers';
 
 let mockRequestResolvedValue: Request | undefined;
 

tests/unit/strings.test.ts

@@ -1,6 +1,6 @@
 import { expect, test } from 'bun:test';
 
-import { toDashCase } from '../../src/utils/helpers';
+import { toDashCase } from '@/src/utils/helpers';
 
 test('correctly convert strings to dash case', async () => {
   expect(toDashCase('superLongSlug')).toBe('super-long-slug');

tsconfig.json

@@ -1,5 +1,7 @@
 {
   "compilerOptions": {
+    "outDir": "dist",
+
     "esModuleInterop": true,
     "resolveJsonModule": true,
     "baseUrl": ".",
@@ -12,7 +14,6 @@
     "allowJs": true,
 
     "moduleResolution": "node",
-    "allowImportingTsExtensions": true,
     "verbatimModuleSyntax": true,
     "noEmit": true,
     "pretty": true,
@@ -22,7 +23,10 @@
     "noFallthroughCasesInSwitch": true,
 
     "noUnusedLocals": true,
-    "noUnusedParameters": true
-  },
-  "references": [{ "path": "./src" }]
+    "noUnusedParameters": true,
+
+    "paths": {
+      "@/src/*": ["./src/*"]
+    }
+  }
 }