fix(*): fix automatic imports (paths)

#1

Author: giveerr

.moon/toolchain.yml

@@ -4,3 +4,7 @@ bun:
   version: "1.1.8"
   dependencyVersionFormat: "workspace"
   syncProjectWorkspaceDependencies: true
+
+typescript:
+  syncProjectReferences: true
+  syncProjectReferencesToPaths: false

bun.lockb

@@ -15,5 +15,8 @@
   "scripts": {
     "prepare": "husky",
     "commit": "commit"
-  }
+  },
+  "trustedDependencies": [
+    "@biomejs/biome"
+  ]
 }

package.json

@@ -10,7 +10,6 @@ tasks:
       - "builder:build"
     inputs:
       - "src/**/*"
-      - "types/**/*"
     outputs:
       - "dist/**"
   watch:
@@ -21,4 +20,3 @@ tasks:
     local: true
     inputs:
       - "src/**/*"
-      - "types/**/*"

packages/core/moon.yml

@@ -1,12 +1,15 @@
 {
   "name": "@sirutils/core",
   "version": "0.0.1",
-  "type": "module",
 
-  "main": "dist/index.js",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": ["dist", "src"],
+  "type": "module",
+  "files": ["dist"],
+  "exports": {
+    ".": {
+      "default": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    }
+  },
 
   "devDependencies": {
     "@sirutils/builder": "workspace:*"

packages/core/package.json

@@ -11,7 +11,6 @@ tasks:
       - "core:build"
     inputs:
       - "src/**/*"
-      - "types/**/*"
     outputs:
       - "dist/**"
   watch:
@@ -23,4 +22,3 @@ tasks:
     local: true
     inputs:
       - "src/**/*"
-      - "types/**/*"

packages/seql/moon.yml

@@ -1,12 +1,15 @@
 {
   "name": "@sirutils/seql",
   "version": "0.0.1",
-  "type": "module",
 
-  "main": "dist/index.js",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": ["dist", "src"],
+  "type": "module",
+  "files": ["dist"],
+  "exports": {
+    ".": {
+      "default": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    }
+  },
 
   "devDependencies": {
     "@sirutils/builder": "workspace:*"

packages/seql/package.json

@@ -31,7 +31,7 @@ declare global {
       }
 
       export interface AdapterOptions {
-        paramterPattern: (str: string) => string
+        parameterPattern: (str: string) => string
       }
 
       export interface Env {

packages/seql/src/definitions/seql.ts

@@ -7,14 +7,14 @@ import { query } from './seql'
 // biome-ignore lint/style/noNamespaceImport: For re-export as Seql
 import * as builder from './utils/builder'
 // biome-ignore lint/style/noNamespaceImport: For re-export as Seql
-import * as generater from './utils/generater'
+import * as generator from './utils/generator'
 // biome-ignore lint/style/noNamespaceImport: For re-export as Seql
 import * as operations from './utils/operations'
 
 export const Seql = {
   query,
 
   ...builder,
-  ...generater,
+  ...generator,
   ...operations,
 }

packages/seql/src/index.ts

@@ -1,3 +1,3 @@
 export const mysqlAdapter: Sirutils.Seql.AdapterOptions = {
-  paramterPattern: () => '?',
+  parameterPattern: () => '?',
 }

packages/seql/src/internal/adapters/mysql.ts

@@ -1,3 +1,3 @@
 export const postgresAdapter: Sirutils.Seql.AdapterOptions = {
-  paramterPattern: str => `$${str}`,
+  parameterPattern: str => `$${str}`,
 }

packages/seql/src/internal/adapters/postgres.ts

@@ -1,7 +1,7 @@
 import type { BlobType } from '@sirutils/core'
 
 import { buildAll } from './utils/builder'
-import { generate } from './utils/generater'
+import { generate } from './utils/generator'
 
 /**
  * Use this for creating queries

packages/seql/src/seql.ts

@@ -5,7 +5,7 @@ import { BUILDER, CACHEABLE_OPERATIONS } from '../internal/consts'
 import { logger } from '../internal/logger'
 import { isObject, unique } from '../internal/utils'
 import { seqlTags } from '../tag'
-import { generateCacheKey, isGenerated } from './generater'
+import { generateCacheKey, isGenerated } from './generator'
 
 /**
  * Base builder all other builds have to rely on this!
@@ -55,7 +55,7 @@ export const safe = <T>(value: T, key: string | null = null, include: true | str
           Array.isArray(include) ? (key ? include.includes(key) : false) : include,
         ])
       : [[key, value, Array.isArray(include) ? (key ? include.includes(key) : false) : include]],
-    nextParamID => selectedAdapter.paramterPattern(nextParamID.toString())
+    nextParamID => selectedAdapter.parameterPattern(nextParamID.toString())
   )
 }
 

packages/seql/src/utils/builder.ts

@@ -1,4 +1,5 @@
 import type { BlobType } from '@sirutils/core'
+
 import { GENERATED } from '../internal/consts'
 import { unique } from '../internal/utils'
 

packages/seql/src/utils/generater.ts packages/seql/src/utils/generator.ts

@@ -1,8 +1,7 @@
-import { buildAll, isBuilder, join, raw, safe, toSqlBuilder } from './builder'
-
 import { AND, INSERT, OR, UPDATE } from '../internal/consts'
 import { extractKeys, filterUndefined } from '../internal/utils'
-import { isGenerated } from './generater'
+import { buildAll, isBuilder, join, raw, safe, toSqlBuilder } from './builder'
+import { isGenerated } from './generator'
 
 /**
  * Object to chained AND (use after WHERE)

packages/seql/src/utils/operations.ts

@@ -1,5 +1,5 @@
 import { Seql } from '../src'
-import { generateCacheKey } from '../src/utils/generater'
+import { generateCacheKey } from '../src/utils/generator'
 
 export const query = Seql.query`SELECT * FROM users WHERE ${Seql.or([
   Seql.and({

packages/seql/test/index.ts

@@ -4,15 +4,9 @@ platform: "bun"
 
 tasks:
   build:
-    command: "bun"
+    command: "bun run src/index.ts build src/index.ts -a"
     deps:
       - "builder:clean"
-    args:
-      - "run"
-      - "src/index.ts"
-      - "build"
-      - "src/index.ts"
-      - "-a"
     inputs:
       - "src/**/*"
     outputs:

tools/builder/moon.yml

@@ -1,16 +1,19 @@
 {
   "name": "@sirutils/builder",
-  "type": "module",
   "version": "0.0.1",
 
   "bin": {
     "builder": "./command.js"
   },
 
-  "main": "dist/index.js",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": ["dist", "./command.js", "src"],
+  "type": "module",
+  "files": ["dist", "./command.js"],
+  "exports": {
+    ".": {
+      "default": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    }
+  },
 
   "devDependencies": {},
   "dependencies": {

tools/builder/package.json

@@ -15,18 +15,19 @@ program
   .option('--cwd <string>', 'cwd', process.cwd())
   .option('-a --external-all', 'externals', false)
   .option('-e --external <numbers...>', 'externals', [])
+  .option('--no-dts', 'bundled .d.ts  file', true)
   .action(async (paths: string[], options) => {
     const externals = [
       ...(options.externalAll ? await dependencies(options.cwd) : []),
       ...(options.external || []),
     ]
 
-    await build(paths, options.cwd, externals)
+    await build(paths, options.cwd, externals, options.dts)
 
     if (options.watch) {
       watch(options.cwd, { recursive: true }, async (event, filename) => {
         if (typeof filename === 'string' && !filename.includes('dist')) {
-          await build(paths, options.cwd, externals)
+          await build(paths, options.cwd, externals, options.dts)
         }
       })
     }

tools/builder/src/index.ts

@@ -1,26 +1,50 @@
-import { existsSync, mkdirSync } from 'node:fs'
-import { join } from 'path'
+import fs from 'fs'
+import path from 'path'
+import {
+  type CompilationOptions,
+  type EntryPointConfig,
+  generateDtsBundle,
+} from 'dts-bundle-generator'
+import { getTsconfig } from 'get-tsconfig'
 
-import type { BunPlugin } from 'bun'
-
-export const definitionGeneratorPlugin: BunPlugin = {
-  name: 'Definition Generator Plugin',
-  async setup(build) {
-    const entrypoints = [...build.config.entrypoints].sort()
+type Options = Omit<EntryPointConfig, 'filePath'> & {
+  compilationOptions?: CompilationOptions
+}
 
-    const outDir = build.config.outdir || './dist'
-    if (!existsSync(outDir)) {
-      mkdirSync(outDir)
-    }
+export const dts = (options?: Options): import('bun').BunPlugin => {
+  return {
+    name: 'bun-plugin-dts',
+    async setup(build) {
+      const { compilationOptions, ...rest } = options || {}
 
-    await Promise.all(
-      entrypoints.map(entry => {
-        const srcFile = entry.replace(/^.*\//, '')
-        const dtsFile = srcFile.replace(/\.[jtm]s$/, '.d.ts')
-        const outFile = join(outDir, dtsFile)
+      const entrypoints = [...build.config.entrypoints].sort()
+      const entries = entrypoints.map(entry => {
+        return {
+          filePath: entry,
+          ...rest,
+        }
+      })
 
-        return Bun.write(outFile, `export * from "../src/${srcFile}"`)
+      const tsconfig = compilationOptions?.preferredConfigPath ?? getTsconfig()?.path
+      const result = generateDtsBundle(entries, {
+        ...compilationOptions,
+        preferredConfigPath: tsconfig,
       })
-    )
-  },
+
+      const outDir = build.config.outdir || './dist'
+      if (!fs.existsSync(outDir)) {
+        fs.mkdirSync(outDir)
+      }
+
+      await Promise.all(
+        entrypoints.map((entry, index) => {
+          const dtsFile = entry.replace(/^.*\//, '').replace(/\.[jtm]s$/, '.d.ts')
+          const outFile = path.join(outDir, dtsFile)
+
+          // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+          return Bun.write(outFile, result[index] as any)
+        })
+      )
+    },
+  }
 }

tools/builder/src/plugins.ts

@@ -1,7 +1,7 @@
 import { join } from 'path'
 import type { BunPlugin } from 'bun'
 
-import { definitionGeneratorPlugin } from './plugins'
+import { dts } from './plugins'
 
 export const dependencies = async (cwd = process.cwd()): Promise<string[]> => {
   const pkg = await Bun.file(join(cwd, './package.json')).json()
@@ -21,11 +21,28 @@ export const build = async (
   paths: string[],
   cwd: string = process.cwd(),
   // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-  external = [] as any[]
+  external = [] as any[],
+  buildDts = true
 ) => {
   const entryPoints = paths.map(p => join(cwd, p))
   const outDir = join(cwd, './dist')
-  const plugins: BunPlugin[] = [definitionGeneratorPlugin]
+  const plugins: BunPlugin[] = []
+
+  if (buildDts) {
+    plugins.push(
+      dts({
+        output: {
+          noBanner: true,
+          inlineDeclareGlobals: true,
+          exportReferencedTypes: false,
+        },
+        compilationOptions: {
+          preferredConfigPath: join(cwd, 'tsconfig.json'),
+          followSymlinks: false,
+        },
+      })
+    )
+  }
 
   await Bun.build({
     entrypoints: entryPoints,

tools/builder/src/utils.ts

@@ -24,6 +24,7 @@
     "strict": true,
     "noUncheckedIndexedAccess": true,
     "strictNullChecks": true,
+    "noImplicitAny": true,
 
     "moduleResolution": "Bundler",
     "module": "esnext",

tsconfig.base.json

@@ -1,4 +1,14 @@
 {
   "extends": "./tsconfig.base.json",
-  "references": []
+  "references": [
+    {
+      "path": "packages/core"
+    },
+    {
+      "path": "packages/seql"
+    },
+    {
+      "path": "tools/builder"
+    }
+  ]
 }