@richapps/ong 0.1.2 → 0.1.4

package/dist/cli.js

@@ -1,6 +1,7 @@
 import { createServer, build } from 'vite';
 import { resolveWorkspace } from './workspace.js';
 import { createViteConfig } from './config.js';
+import { prebundleLibs } from './prebundle.js';
 import { banner, printBuildStats, printHelp, error } from './log.js';
 function parseArgs(argv) {
     const args = argv.slice(2);
@@ -37,6 +38,9 @@ function parseArgs(argv) {
         else if (arg === '--watch' || arg === '-w') {
             result.watch = true;
         }
+        else if (arg === '--prebundle-libs') {
+            result.prebundleLibs = true;
+        }
         else if (arg === '--help' || arg === '-h') {
             return { command: 'help' };
         }
@@ -68,7 +72,10 @@ async function main() {
     };
     const buildOpts = resolveWorkspace(cwd, resolveOpts);
     banner(args.command, buildOpts.projectName, buildOpts.configName);
-    const viteConfig = createViteConfig(buildOpts);
+    let viteConfig = createViteConfig(buildOpts);
+    if (args.prebundleLibs && args.command === 'serve') {
+        viteConfig = await prebundleLibs(viteConfig, buildOpts);
+    }
     if (args.command === 'serve') {
         const server = await createServer(viteConfig);
         await server.listen();

package/dist/config.d.ts

@@ -1,5 +1,10 @@
-import type { InlineConfig } from 'vite';
+import type { InlineConfig, Alias } from 'vite';
 import type { ResolvedBuildOptions } from './workspace.js';
+/**
+ * Reads tsconfig paths and converts them to Vite resolve aliases.
+ * Follows tsconfig "extends" chain to find paths from base configs.
+ */
+export declare function resolveTsconfigPaths(tsconfig: string, workspaceRoot: string): Alias[];
 /**
  * Creates a Vite InlineConfig from resolved Angular build options.
  */

package/dist/config.js

@@ -6,28 +6,25 @@ import { htmlInjectPlugin, assetCopyPlugin } from './plugins.js';
  * Reads tsconfig paths and converts them to Vite resolve aliases.
  * Follows tsconfig "extends" chain to find paths from base configs.
  */
-function resolveTsconfigPaths(tsconfig, workspaceRoot) {
+export function resolveTsconfigPaths(tsconfig, workspaceRoot) {
     const aliases = [];
     try {
         let configPath = tsconfig;
         let paths;
         let baseUrl = '.';
         // Walk the extends chain to find paths
-        while (configPath && !paths) {
+        // Collect baseUrl from each level; paths from the first config that defines them
+        const configChain = [];
+        while (configPath) {
             if (!existsSync(configPath))
                 break;
             const raw = readFileSync(configPath, 'utf-8');
             // Strip comments (single-line // and multi-line /* */)
             const stripped = raw.replace(/\/\/.*$/gm, '').replace(/\/\*[\s\S]*?\*\//g, '');
             const config = JSON.parse(stripped);
-            const compilerOptions = config.compilerOptions ?? {};
-            if (compilerOptions.paths) {
-                paths = compilerOptions.paths;
-                baseUrl = compilerOptions.baseUrl ?? '.';
-            }
+            configChain.push(config);
             if (config.extends) {
                 configPath = resolve(configPath, '..', config.extends);
-                // Add .json if not present
                 if (!configPath.endsWith('.json'))
                     configPath += '.json';
             }
@@ -35,6 +32,14 @@ function resolveTsconfigPaths(tsconfig, workspaceRoot) {
                 break;
             }
         }
+        // Resolve inherited values: child overrides parent
+        for (let i = configChain.length - 1; i >= 0; i--) {
+            const compilerOptions = configChain[i].compilerOptions ?? {};
+            if (compilerOptions.baseUrl !== undefined)
+                baseUrl = compilerOptions.baseUrl;
+            if (compilerOptions.paths !== undefined)
+                paths = compilerOptions.paths;
+        }
         if (!paths)
             return aliases;
         const baseDir = resolve(workspaceRoot, baseUrl);
@@ -90,8 +95,8 @@ export function createViteConfig(opts) {
     const cssPreprocessorOptions = {};
     if (opts.stylePreprocessorOptions.includePaths.length) {
         const paths = opts.stylePreprocessorOptions.includePaths;
-        cssPreprocessorOptions.scss = { includePaths: paths };
-        cssPreprocessorOptions.sass = { includePaths: paths };
+        cssPreprocessorOptions.scss = { api: 'modern-compiler', loadPaths: paths };
+        cssPreprocessorOptions.sass = { api: 'modern-compiler', loadPaths: paths };
         cssPreprocessorOptions.less = { paths };
     }
     return {

package/dist/index.d.ts

@@ -11,3 +11,4 @@ export { resolveWorkspace, detectWorkspace } from './workspace.js';
 export type { ResolvedBuildOptions, ResolveOptions, AssetConfig } from './workspace.js';
 export { createViteConfig } from './config.js';
 export { htmlInjectPlugin, assetCopyPlugin } from './plugins.js';
+export { prebundleLibs } from './prebundle.js';

package/dist/index.js

@@ -10,3 +10,4 @@
 export { resolveWorkspace, detectWorkspace } from './workspace.js';
 export { createViteConfig } from './config.js';
 export { htmlInjectPlugin, assetCopyPlugin } from './plugins.js';
+export { prebundleLibs } from './prebundle.js';

package/dist/log.js

@@ -80,6 +80,7 @@ export function printHelp() {
     -o, --open                  Open browser on start
         --host <host>           Dev server host
     -w, --watch                 Rebuild on file changes (build mode)
+        --prebundle-libs            Pre-bundle local libs to resolve circular deps
 
   ${c.bold}Workspace support:${c.reset}
     angular.json                Standard Angular CLI workspace

package/dist/prebundle.d.ts

@@ -0,0 +1,8 @@
+import { type InlineConfig } from 'vite';
+import type { ResolvedBuildOptions } from './workspace.js';
+/**
+ * Pre-bundles local workspace libraries using rolldown + OXC.
+ * This resolves circular dependencies within libs by bundling each
+ * into a single ESM file before the Vite dev server starts.
+ */
+export declare function prebundleLibs(viteConfig: InlineConfig, opts: ResolvedBuildOptions): Promise<InlineConfig>;

package/dist/prebundle.js

@@ -0,0 +1,113 @@
+import { join } from 'node:path';
+import { mkdirSync, rmSync } from 'node:fs';
+import { build } from 'vite';
+import { angular } from '@oxc-angular/vite';
+import { resolveTsconfigPaths } from './config.js';
+import { c } from './log.js';
+/**
+ * Pre-bundles local workspace libraries using rolldown + OXC.
+ * This resolves circular dependencies within libs by bundling each
+ * into a single ESM file before the Vite dev server starts.
+ */
+export async function prebundleLibs(viteConfig, opts) {
+    const aliases = resolveTsconfigPaths(opts.tsconfig, opts.workspaceRoot);
+    // Find aliases pointing to local workspace files (not node_modules)
+    const localLibs = [];
+    for (const alias of aliases) {
+        // Only handle exact-match aliases (string find), not wildcards (RegExp)
+        if (typeof alias.find !== 'string')
+            continue;
+        const target = alias.replacement;
+        // Must be inside workspace and not in node_modules
+        if (!target.startsWith(opts.workspaceRoot))
+            continue;
+        if (target.includes('node_modules'))
+            continue;
+        localLibs.push({
+            find: alias.find,
+            entry: target,
+            fileName: alias.find.replace(/[@/]/g, '_').replace(/^_+/, ''),
+        });
+    }
+    if (localLibs.length === 0)
+        return viteConfig;
+    const start = Date.now();
+    console.log(`  ${c.cyan}Pre-bundling ${localLibs.length} local lib${localLibs.length > 1 ? 's' : ''}...${c.reset}`);
+    // Output inside workspace node_modules so Vite can resolve bare imports
+    const tempDir = join(opts.workspaceRoot, 'node_modules', '.ong-prebundle');
+    rmSync(tempDir, { recursive: true, force: true });
+    mkdirSync(tempDir, { recursive: true });
+    // Bundle each lib in parallel
+    const results = await Promise.allSettled(localLibs.map(lib => bundleLib(lib, tempDir, aliases, opts, viteConfig)));
+    // Collect successfully bundled libs
+    const bundled = new Map();
+    results.forEach((result, i) => {
+        if (result.status === 'fulfilled') {
+            bundled.set(localLibs[i].find, join(tempDir, `${localLibs[i].fileName}.mjs`));
+        }
+        else {
+            console.log(`  ${c.yellow}Warning: failed to pre-bundle ${localLibs[i].find}${c.reset}`);
+            console.log(`  ${c.dim}${result.reason?.message ?? result.reason}${c.reset}`);
+        }
+    });
+    if (bundled.size === 0)
+        return viteConfig;
+    const duration = Date.now() - start;
+    const names = [...bundled.keys()].join(', ');
+    console.log(`  ${c.green}Pre-bundled in ${duration}ms:${c.reset} ${c.dim}${names}${c.reset}`);
+    console.log();
+    // Rewrite aliases: bundled libs point to the temp output
+    const newAliases = aliases.map(alias => {
+        if (typeof alias.find === 'string' && bundled.has(alias.find)) {
+            return { find: alias.find, replacement: bundled.get(alias.find) };
+        }
+        return alias;
+    });
+    return {
+        ...viteConfig,
+        resolve: {
+            ...(viteConfig.resolve ?? {}),
+            alias: newAliases,
+        },
+    };
+}
+async function bundleLib(lib, outDir, allAliases, opts, parentConfig) {
+    await build({
+        configFile: false,
+        root: opts.workspaceRoot,
+        logLevel: 'warn',
+        plugins: [
+            ...angular({
+                tsconfig: opts.tsconfig,
+                sourceMap: opts.sourceMap,
+                workspaceRoot: opts.workspaceRoot,
+            }),
+        ],
+        resolve: {
+            // All tsconfig aliases so inter-lib imports resolve
+            alias: allAliases,
+        },
+        // Pass through same CSS config for SCSS/Less resolution
+        css: parentConfig.css,
+        build: {
+            lib: {
+                entry: lib.entry,
+                formats: ['es'],
+                fileName: lib.fileName,
+            },
+            outDir,
+            emptyOutDir: false,
+            sourcemap: opts.sourceMap,
+            minify: false,
+            rollupOptions: {
+                external: (id) => {
+                    // Bundle relative/absolute imports (internal to the lib)
+                    if (id.startsWith('.') || id.startsWith('/'))
+                        return false;
+                    // Externalize everything else (npm packages, other local lib aliases)
+                    return true;
+                },
+            },
+        },
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@richapps/ong",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Angular CLI powered by Vite + OXC — blazing fast drop-in replacement for ng serve/build",
   "keywords": [
     "angular",