@open-mercato/core 0.5.1-develop.2683.4878a05b8e → 0.5.1-develop.2691.d8a0934b37

package/.turbo/turbo-build.log

@@ -1,2 +1,4 @@
-Found 2340 source entry points
-core built successfully
+[build:core] found 2340 entry points
+[build:core] built successfully
+[build:core:generated] found 169 entry points
+[build:core:generated] built successfully

package/build.mjs

@@ -1,173 +1,51 @@
-import * as esbuild from 'esbuild'
 import { glob } from 'glob'
-import { readFileSync, writeFileSync, existsSync, mkdirSync, copyFileSync, readdirSync, rmSync } from 'node:fs'
 import { dirname, join, relative } from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { buildPackage } from '../../scripts/build-package.mjs'
 
-const __dirname = dirname(fileURLToPath(import.meta.url))
-const outdir = join(__dirname, 'dist')
-
-mkdirSync(outdir, { recursive: true })
-for (const entry of readdirSync(outdir)) {
-  rmSync(join(outdir, entry), { recursive: true, force: true })
-}
-
-const srcEntryPoints = await glob('src/**/*.{ts,tsx}', {
-  cwd: __dirname,
-  ignore: ['**/__tests__/**', '**/*.test.ts', '**/*.test.tsx'],
-  absolute: true,
-})
-
-const generatedEntryPoints = await glob('generated/**/*.{ts,tsx}', {
-  cwd: __dirname,
-  ignore: ['**/__tests__/**', '**/*.test.ts', '**/*.test.tsx'],
-  absolute: true,
-})
-
-if (srcEntryPoints.length === 0) {
-  console.error('No source entry points found!')
-  process.exit(1)
-}
-
-console.log(`Found ${srcEntryPoints.length} source entry points`)
-
-const entryPoints = srcEntryPoints
+const packageDir = dirname(fileURLToPath(import.meta.url))
+const distDir = join(packageDir, 'dist')
 
 const toImportPath = (p) => p.replace(/\\/g, '/')
 
-// Plugin to add .js extension to relative imports and resolve #generated/* imports
-const addJsExtension = {
-  name: 'add-js-extension',
-  setup(build) {
-    build.onEnd(async (result) => {
-      if (result.errors.length > 0) return
-      const outputFiles = await glob('dist/**/*.js', { cwd: __dirname, absolute: true })
-      const distDir = join(__dirname, 'dist')
-      for (const file of outputFiles) {
-        const fileDir = dirname(file)
-        let content = readFileSync(file, 'utf-8')
-
-        // Helper to resolve #generated/* paths
-        const resolveGeneratedPath = (importPath) => {
-          if (importPath === 'entity-fields-registry') {
-            // Special case: entity-fields-registry is in generated-shims
-            return join(distDir, 'generated-shims', 'entity-fields-registry.js')
-          } else if (importPath.startsWith('entities/')) {
-            // Entity imports: #generated/entities/<name> → dist/generated/entities/<name>/index.js
-            return join(distDir, 'generated', importPath, 'index.js')
-          } else {
-            // Other generated files: #generated/<name> → dist/generated/<name>.js
-            return join(distDir, 'generated', importPath + '.js')
-          }
-        }
-
-        // Resolve #generated/* static imports to relative paths
-        content = content.replace(
-          /from\s+["']#generated\/([^"']+)["']/g,
-          (match, importPath) => {
-            const targetPath = resolveGeneratedPath(importPath)
-            let relativePath = toImportPath(relative(fileDir, targetPath))
-            if (!relativePath.startsWith('.')) {
-              relativePath = './' + relativePath
-            }
-            return `from "${relativePath}"`
-          }
-        )
-
-        // Resolve #generated/* dynamic imports to relative paths
-        content = content.replace(
-          /import\s*\(\s*["']#generated\/([^"']+)["']\s*\)/g,
-          (match, importPath) => {
-            const targetPath = resolveGeneratedPath(importPath)
-            let relativePath = toImportPath(relative(fileDir, targetPath))
-            if (!relativePath.startsWith('.')) {
-              relativePath = './' + relativePath
-            }
-            return `import("${relativePath}")`
-          }
-        )
-
-        // Add .js to relative imports that don't have an extension
-        content = content.replace(
-          /from\s+["'](\.[^"']+)["']/g,
-          (match, path) => {
-            if (path.endsWith('.js') || path.endsWith('.json')) return match
-            // Check if it's a directory with index.js
-            const resolvedPath = join(fileDir, path)
-            if (existsSync(resolvedPath) && existsSync(join(resolvedPath, 'index.js'))) {
-              return `from "${path}/index.js"`
-            }
-            return `from "${path}.js"`
-          }
-        )
-        content = content.replace(
-          /import\s*\(\s*["'](\.[^"']+)["']\s*\)/g,
-          (match, path) => {
-            if (path.endsWith('.js') || path.endsWith('.json')) return match
-            // Check if it's a directory with index.js
-            const resolvedPath = join(fileDir, path)
-            if (existsSync(resolvedPath) && existsSync(join(resolvedPath, 'index.js'))) {
-              return `import("${path}/index.js")`
-            }
-            return `import("${path}.js")`
-          }
-        )
-        // Handle side-effect imports: import "./path" (no from clause)
-        content = content.replace(
-          /import\s+["'](\.[^"']+)["'];/g,
-          (match, path) => {
-            if (path.endsWith('.js') || path.endsWith('.json')) return match
-            // Check if it's a directory with index.js
-            const resolvedPath = join(fileDir, path)
-            if (existsSync(resolvedPath) && existsSync(join(resolvedPath, 'index.js'))) {
-              return `import "${path}/index.js";`
-            }
-            return `import "${path}.js";`
-          }
-        )
-        writeFileSync(file, content)
-      }
-    })
+// Translate `#generated/<name>` imports into a relative path into dist/generated/.
+// Called per emitted .js file by the shared atomic-write plugin.
+function resolveGeneratedImport(importPath, fileDir) {
+  let targetPath
+  if (importPath === 'entity-fields-registry') {
+    targetPath = join(distDir, 'generated-shims', 'entity-fields-registry.js')
+  } else if (importPath.startsWith('entities/')) {
+    targetPath = join(distDir, 'generated', importPath, 'index.js')
+  } else {
+    targetPath = join(distDir, 'generated', importPath + '.js')
   }
+  let rel = toImportPath(relative(fileDir, targetPath))
+  if (!rel.startsWith('.')) rel = './' + rel
+  return rel
 }
 
-await esbuild.build({
-  entryPoints,
-  outdir,
-  outbase: join(__dirname, 'src'),
-  format: 'esm',
-  platform: 'node',
-  target: 'node18',
-  sourcemap: true,
-  jsx: 'automatic',
-  plugins: [addJsExtension],
+const rewriteOptions = { resolveGeneratedImport }
+
+await buildPackage(packageDir, {
+  name: 'core',
+  clearDist: true,
+  copyJson: true,
+  copyJsonIgnore: ['**/i18n/**'],
+  rewriteOptions,
 })
 
-// Copy JSON files from src to dist (esbuild doesn't handle non-entry JSON files)
-const jsonFiles = await glob('src/**/*.json', {
-  cwd: __dirname,
-  ignore: ['**/node_modules/**', '**/i18n/**'], // i18n files are handled differently
+const generatedEntryPoints = await glob('generated/**/*.{ts,tsx}', {
+  cwd: packageDir,
+  ignore: ['**/__tests__/**', '**/*.test.ts', '**/*.test.tsx'],
   absolute: true,
 })
-for (const jsonFile of jsonFiles) {
-  const relativePath = relative(join(__dirname, 'src'), jsonFile)
-  const destPath = join(outdir, relativePath)
-  mkdirSync(dirname(destPath), { recursive: true })
-  copyFileSync(jsonFile, destPath)
-}
 
-// Build generated files to dist/generated
 if (generatedEntryPoints.length > 0) {
-  await esbuild.build({
+  await buildPackage(packageDir, {
+    name: 'core:generated',
     entryPoints: generatedEntryPoints,
-    outdir: join(__dirname, 'dist/generated'),
-    outbase: join(__dirname, 'generated'),
-    format: 'esm',
-    platform: 'node',
-    target: 'node18',
-    sourcemap: true,
-    plugins: [addJsExtension],
+    outbase: 'generated',
+    outdir: 'dist/generated',
+    rewriteOptions,
   })
 }
-
-console.log('core built successfully')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.5.1-develop.2683.4878a05b8e",
+  "version": "0.5.1-develop.2691.d8a0934b37",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -234,10 +234,10 @@
     "ts-pattern": "^5.0.0"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.5.1-develop.2683.4878a05b8e"
+    "@open-mercato/shared": "0.5.1-develop.2691.d8a0934b37"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.5.1-develop.2683.4878a05b8e",
+    "@open-mercato/shared": "0.5.1-develop.2691.d8a0934b37",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",