nmtjs 0.16.1 → 0.17.0-beta.2

package/dist/vite/servers/worker.js

@@ -1,124 +0,0 @@
-import { DevEnvironment, mergeConfig } from 'vite';
-import { createConfig } from '../config.js';
-import { plugins } from '../plugins.js';
-import { createServer } from '../server.js';
-export async function createViteServer(options, mode, neemataConfig, events) {
-    const config = createConfig(options);
-    const applicationEntries = Object.values(options.applicationImports).map((v) => v.path);
-    const _injectHmr = `\n\nif(import.meta.hot) { import.meta.hot.accept((module) => globalThis._hotAccept?.(module)) }`;
-    const server = await createServer(options, mergeConfig(neemataConfig.vite, {
-        appType: 'custom',
-        clearScreen: false,
-        resolve: { alias: config.alias, external: ['@nmtjs/proxy'] },
-        mode,
-        optimizeDeps: { noDiscovery: true },
-        plugins: [
-            ...plugins,
-            ...(mode === 'development'
-                ? [
-                    {
-                        name: 'neemata-worker-application-hmr',
-                        transform(code, id, _options) {
-                            if (applicationEntries.includes(id)) {
-                                return code + _injectHmr;
-                            }
-                        },
-                        handleHotUpdate(ctx) {
-                            // Emit event when application entry files change
-                            // This allows restarting failed workers after code fixes
-                            if (ctx.file && applicationEntries.includes(ctx.file)) {
-                                events.emit('hmr-update', { file: ctx.file });
-                            }
-                        },
-                    },
-                ]
-                : []),
-        ],
-    }), {
-        createEnvironment: async (name, config, context) => {
-            const connections = new Map();
-            const clients = new Map();
-            const handlers = new Map();
-            const emit = (event, data, client) => {
-                const listeners = handlers.get(event);
-                if (!listeners?.size)
-                    return;
-                for (const listener of listeners) {
-                    ;
-                    listener(data, client);
-                }
-            };
-            events.on('worker', ({ worker, vitePort }) => {
-                if (!vitePort)
-                    return;
-                const client = {
-                    send: (payload) => {
-                        vitePort.postMessage(payload);
-                    },
-                };
-                const handleMessage = (value) => {
-                    if (value.type === 'custom') {
-                        emit(value.event, value.data, client);
-                    }
-                };
-                let disconnected = false;
-                const disconnect = (closePort) => {
-                    if (disconnected)
-                        return;
-                    disconnected = true;
-                    emit('vite:client:disconnect', undefined, client);
-                    vitePort.off('message', handleMessage);
-                    worker.off('exit', handleWorkerExit);
-                    vitePort.off('close', handlePortClose);
-                    if (closePort) {
-                        vitePort.close();
-                    }
-                    connections.delete(worker.threadId);
-                    clients.delete(worker.threadId);
-                };
-                const handleWorkerExit = () => disconnect(true);
-                const handlePortClose = () => disconnect(false);
-                vitePort.on('message', handleMessage);
-                worker.once('exit', handleWorkerExit);
-                vitePort.once('close', handlePortClose);
-                connections.set(worker.threadId, { worker, port: vitePort, client });
-                clients.set(worker.threadId, client);
-                emit('vite:client:connect', undefined, client);
-            });
-            const transport = {
-                send(data) {
-                    for (const connection of connections.values()) {
-                        connection.port.postMessage(data);
-                    }
-                },
-                on(event, handler) {
-                    let listeners = handlers.get(event);
-                    if (!listeners) {
-                        listeners = new Set();
-                        handlers.set(event, listeners);
-                    }
-                    listeners.add(handler);
-                },
-                off(event, handler) {
-                    if (!handler) {
-                        handlers.delete(event);
-                        return;
-                    }
-                    const listeners = handlers.get(event);
-                    if (!listeners)
-                        return;
-                    listeners.delete(handler);
-                    if (!listeners.size) {
-                        handlers.delete(event);
-                    }
-                },
-            };
-            return new DevEnvironment(name, config, {
-                hot: mode === 'development',
-                transport,
-            });
-        },
-    });
-    return server;
-}
-//# sourceMappingURL=worker.js.map

package/dist/vite/servers/worker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/vite/servers/worker.ts"],"names":[],"mappings":"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"}

package/src/cli.ts

@@ -1,162 +0,0 @@
-import { existsSync } from 'node:fs'
-import { relative, resolve } from 'node:path'
-import process from 'node:process'
-
-import type { ArgDef } from 'citty'
-import { defineCommand, runMain } from 'citty'
-import { config as dotenv } from 'dotenv'
-
-import type { NeemataConfig } from './config.ts'
-import type { ViteConfigOptions } from './vite/config.ts'
-import { generateTypings } from './codegen.ts'
-import { resolver } from './resolver.ts'
-import { createBuilder } from './vite/builder.ts'
-import { baseViteConfigOptions } from './vite/config.ts'
-import { createMainServer } from './vite/servers/main.ts'
-
-const commonArgs = {
-  config: {
-    type: 'string',
-    alias: 'c',
-    description: 'Path to Neemata config file',
-    required: false,
-  },
-} satisfies Record<string, ArgDef>
-
-function resolveConfigPath(configPathArg: string | undefined): string {
-  if (configPathArg) {
-    return resolve(configPathArg)
-  }
-
-  const tsConfigPath = resolve('./neemata.config.ts')
-  if (existsSync(tsConfigPath)) {
-    return tsConfigPath
-  }
-
-  const jsConfigPath = resolve('./neemata.config.js')
-  if (existsSync(jsConfigPath)) {
-    return jsConfigPath
-  }
-
-  throw new Error(
-    'Failed to resolve Neemata config file. Create neemata.config.ts or neemata.config.js, or pass --config.',
-  )
-}
-
-let config: NeemataConfig
-let viteConfigOptions: ViteConfigOptions
-let applicationImports: Record<
-  string,
-  { path: string; specifier: string; type: 'neemata' | 'custom' }
->
-
-async function runPrepare() {
-  await generateTypings(applicationImports)
-}
-
-const mainCommand = defineCommand({
-  meta: { description: 'Neemata CLI' },
-  args: { ...commonArgs },
-  async setup(ctx) {
-    const configPath = resolveConfigPath(ctx.args.config as string | undefined)
-    config = await import(configPath).then((m) => m.default)
-
-    for (const env of config.env) {
-      if (typeof env === 'string') {
-        const { error } = dotenv({ path: env })
-        if (error) console.warn(error)
-      } else if (typeof env === 'object') {
-        for (const key in env) {
-          process.env[key] = env[key]
-        }
-      }
-    }
-
-    applicationImports = {}
-    const currentPkg = resolver.sync(process.cwd(), './package.json')
-
-    for (const [appName, application] of Object.entries(config.applications)) {
-      const { specifier: appSpecifier, type } = application
-      const resolution = resolver.sync(process.cwd(), appSpecifier)
-      if (resolution.error)
-        throw new Error(
-          `Failed to resolve application path for ${appName}: ${resolution.error}`,
-        )
-      if (!resolution.path)
-        throw new Error(
-          `Failed to resolve application path for ${appName}: no path found`,
-        )
-      const specifier =
-        resolution.packageJsonPath === currentPkg.path
-          ? relative(resolve('.neemata'), resolution.path)
-          : appSpecifier
-      applicationImports[appName] = { path: resolution.path, specifier, type }
-    }
-
-    viteConfigOptions = {
-      applicationImports,
-      serverEntryPath: resolve(config.serverPath),
-      ...baseViteConfigOptions,
-      configPath,
-    }
-  },
-  subCommands: {
-    prepare: defineCommand({
-      async run(ctx) {
-        await runPrepare()
-      },
-    }),
-    dev: defineCommand({
-      async run(ctx) {
-        await runPrepare()
-        const { runner } = await createMainServer(
-          viteConfigOptions,
-          'development',
-          config,
-        )
-        await runner.import(viteConfigOptions.entrypointMainPath)
-      },
-    }),
-    preview: defineCommand({
-      async run(ctx) {
-        await runPrepare()
-        const { runner } = await createMainServer(
-          viteConfigOptions,
-          'production',
-          config,
-        )
-        await runner.import(viteConfigOptions.entrypointMainPath)
-      },
-    }),
-    build: defineCommand({
-      async run(ctx) {
-        await runPrepare()
-        const builder = await createBuilder(viteConfigOptions, config)
-        await builder.build()
-      },
-    }),
-    // command: defineCommand({
-    //   async run(ctx) {
-    //     const runner = await createRunner(
-    //       viteConfigOptions,
-    //       'production',
-    //       config,
-    //     )
-    //     const workerModule = await runner.import<
-    //       typeof import('./entrypoints/worker.ts')
-    //     >(import.meta.resolve('./entrypoints/worker.js'))
-    //     const commandModule = await runner.import<
-    //       typeof import('./command.ts')
-    //     >(import.meta.resolve('./command.js'))
-    //     const worker = await workerModule.default({
-    //       applicationWorkerData: undefined,
-    //       type: ApplicationType.Command,
-    //       workerType: ApplicationWorkerType.Command,
-    //     })
-    //     await runMain(commandModule.default(worker), { rawArgs: ctx.rawArgs })
-    //   },
-    // }),
-  },
-})
-
-runMain(mainCommand)

package/src/codegen.ts

@@ -1,30 +0,0 @@
-import { mkdir, writeFile } from 'node:fs/promises'
-import { resolve } from 'node:path'
-
-import dedent from 'dedent'
-
-export async function generateTypings(
-  applicationImports: Record<
-    string,
-    { path: string; specifier: string; type: 'neemata' | 'custom' }
-  >,
-) {
-  await mkdir('.neemata', { recursive: true }).catch(() => {})
-  await writeFile(
-    resolve('.neemata', 'types.d.ts'),
-    dedent`
-    /// <reference types="nmtjs/runtime/types" />
-
-    declare module 'nmtjs/runtime/types' {
-      interface Applications {
-        ${Object.entries(applicationImports)
-          .map(
-            ([appName, { specifier, type }]) =>
-              `'${appName}': { type: '${type}'; definition: typeof import('${specifier}').default }`,
-          )
-          .join('\n')}
-      }
-    }
-    `,
-  )
-}

package/src/config.ts

@@ -1,69 +0,0 @@
-import { resolve } from 'node:path'
-
-import type { UserConfig } from 'vite'
-import { mergeConfig } from 'vite'
-
-export type ExternalDependency = string | RegExp
-
-type DeepPartial<T> = {
-  [P in keyof T]?: T[P] extends Record<any, unknown> ? DeepPartial<T[P]> : T[P]
-}
-
-export interface NeemataConfig {
-  /**
-   * Path to application entry point
-   */
-  applications: {
-    /**
-     * Application name
-     */
-    [appName: string]: { type: 'neemata' | 'custom'; specifier: string }
-  }
-  /**
-   * Path to server entry point
-   */
-  serverPath: string
-  /**
-   * External dependencies to exclude from application bundle
-   *
-   * 'prod' - exclude production dependencies from package.json
-   *
-   * 'all' - exclude all dependencies from package.json
-   *
-   * ExternalDependency[] - array of package names or regular expressions to match package names
-   */
-  externalDependencies: 'prod' | 'all' | ExternalDependency[]
-  /**
-   * Timeout in milliseconds for graceful shutdown of application workers
-   */
-  timeout: number
-
-  /**
-   * Environment variables to set for application workers
-   *
-   * Strings are paths to .env files
-   * Records are key-value pairs to set directly
-   */
-  env: (Record<string, string> | string)[]
-
-  vite: UserConfig
-}
-
-export function defineConfig(
-  config: DeepPartial<NeemataConfig> = {},
-): NeemataConfig {
-  return {
-    serverPath: './src/server.ts',
-    externalDependencies: 'prod',
-    timeout: 10000,
-    env: [],
-    plugins: [],
-    ...config,
-    // @ts-expect-error
-    applications: config.applications || {},
-    vite: mergeConfig(
-      { build: { outDir: resolve('./dist'), minify: true } },
-      config.vite || {},
-    ),
-  }
-}

package/src/entrypoints/cli.ts

@@ -1,13 +0,0 @@
-// // import { ApplicationType, ApplicationWorkerType } from '@nmtjs/application'
-// import { runMain } from 'citty'
-
-// import command from '../command.ts'
-// import createWorker from './worker.ts'
-
-// const worker = await createWorker({
-//   applicationWorkerData: undefined,
-//   // type: ApplicationType.Command,
-//   // workerType: ApplicationWorkerType.Command,
-// })
-
-// runMain(command(worker))