stonyx 0.2.3-alpha.30 → 0.2.3-alpha.32

package/config/environment copy.ts

@@ -0,0 +1,16 @@
+import type { StoynxConfig } from 'stonyx';
+
+// project configuration, override-able by listed environment variables
+const {
+  DEBUG,
+  NODE_ENV,
+} = process.env;
+
+const environment = NODE_ENV ?? 'development';
+
+const config: StoynxConfig = {
+  environment,
+  debug: DEBUG ?? environment === 'development',
+};
+
+export default config;

package/dist/cli/serve.js

@@ -1,5 +1,8 @@
+import { resolve } from 'path';
+import { pathToFileURL } from 'url';
 import { runStartupHooks, runShutdownHooks } from '../lifecycle.js';
 import { importConfig } from '../util/import-config.js';
+import { resolveEntryPoint } from '../util/resolve-entry-point.js';
 export function createShutdownHandler(modules) {
     let shuttingDown = false;
     return async () => {
@@ -26,7 +29,8 @@ export function maybeRegisterAppShutdown(modules, appInstance, originalShutdown)
 export default async function serve({ args }) {
     const cwd = process.cwd();
     const entryFlag = args.indexOf('--entry');
-    const entryPoint = (entryFlag !== -1 && entryFlag + 1 < args.length) ? args[entryFlag + 1] : 'app.js';
+    const entryArg = (entryFlag !== -1 && entryFlag + 1 < args.length) ? args[entryFlag + 1] : null;
+    const entryPoint = entryArg !== null ? resolve(cwd, entryArg) : resolveEntryPoint(`${cwd}/app`);
     const config = await importConfig(`${cwd}/config/environment`);
     const { default: Stonyx } = await import('../main.js');
     new Stonyx(config, cwd);
@@ -36,7 +40,7 @@ export default async function serve({ args }) {
     const shutdown = createShutdownHandler(modules);
     process.on('SIGTERM', shutdown);
     process.on('SIGINT', shutdown);
-    const entryModule = await import(`${cwd}/${entryPoint}`);
+    const entryModule = await import(pathToFileURL(entryPoint).href);
     let appInstance;
     if (entryModule.default) {
         appInstance = new entryModule.default();

package/dist/main.js

@@ -15,9 +15,9 @@
  */
 import Chronicle from '@stonyx/logs';
 import loadModules from './modules.js';
-import { kebabCaseToCamelCase } from '@stonyx/utils/string';
 import { mergeObject } from '@stonyx/utils/object';
 import { importConfig } from './util/import-config.js';
+import { resolveModuleName } from './util/resolve-module-name.js';
 export default class Stonyx {
     static initialized = false;
     static modulePromises = {};
@@ -37,11 +37,15 @@ export default class Stonyx {
             throw new Error('Stonyx requires full environment configuration on startup');
         if (!rootPath)
             throw new Error('Stonyx requires root project\'s path on startup');
-        // Transform config from stonyx-modules running as a standalone
-        if (rootPath.includes('stonyx-')) {
-            const dirName = rootPath.split('/').pop() ?? '';
-            const moduleName = kebabCaseToCamelCase(dirName.replace('stonyx-', ''));
-            config = { [moduleName]: config, ...(config.modules || {}) };
+        // Transform config from stonyx-modules running as a standalone.
+        // Signal is the consumer's `package.json#name` (see resolveModuleName);
+        // this replaces the brittle `rootPath.includes('stonyx-')` heuristic so
+        // non-canonical rootPaths (worktrees, forks, renames) still work.
+        const moduleName = resolveModuleName(rootPath);
+        if (moduleName) {
+            const flatConfig = config;
+            const siblingModules = flatConfig.modules || {};
+            config = { [moduleName]: config, ...siblingModules };
             delete config.modules;
         }
         this.config = config;

package/dist/util/resolve-entry-point.d.ts

@@ -0,0 +1 @@
+export declare function resolveEntryPoint(basePath: string): string;

package/dist/util/resolve-entry-point.js

@@ -0,0 +1,14 @@
+import { existsSync } from 'fs';
+import { resolve } from 'path';
+const EXTENSIONS = ['ts', 'js'];
+export function resolveEntryPoint(basePath) {
+    const matches = EXTENSIONS.filter(ext => existsSync(resolve(`${basePath}.${ext}`)));
+    if (matches.length === 0) {
+        throw new Error(`Entry point not found: ${basePath}.{ts,js}`);
+    }
+    if (matches.length > 1) {
+        console.warn(`Warning: both ${basePath}.ts and ${basePath}.js exist. Using .ts — delete the .js to silence this warning (it is likely a stale compiled artifact or postinstall stub).`);
+    }
+    const ext = matches[0];
+    return resolve(`${basePath}.${ext}`);
+}

package/dist/util/resolve-module-name.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Resolve a stonyx standalone module's camelCase name from the consumer's
+ * `package.json#name`. Used by the standalone-config transform to wrap a flat
+ * config under the module's key when a stonyx module runs its own tests.
+ *
+ * Recognises:
+ *   - `@stonyx/<kebab>`  → `<camel>`
+ *   - `stonyx-<kebab>`   → `<camel>` (unscoped fallback)
+ *   - Anything else      → `null` (caller should skip the transform)
+ *
+ * Missing or malformed `package.json` returns `null` silently — matches the
+ * fail-safe semantics of the previous `rootPath.includes('stonyx-')` heuristic.
+ */
+export declare function resolveModuleName(rootPath: string): string | null;

package/dist/util/resolve-module-name.js

@@ -0,0 +1,33 @@
+import { readFileSync } from 'fs';
+import { kebabCaseToCamelCase } from '@stonyx/utils/string';
+/**
+ * Resolve a stonyx standalone module's camelCase name from the consumer's
+ * `package.json#name`. Used by the standalone-config transform to wrap a flat
+ * config under the module's key when a stonyx module runs its own tests.
+ *
+ * Recognises:
+ *   - `@stonyx/<kebab>`  → `<camel>`
+ *   - `stonyx-<kebab>`   → `<camel>` (unscoped fallback)
+ *   - Anything else      → `null` (caller should skip the transform)
+ *
+ * Missing or malformed `package.json` returns `null` silently — matches the
+ * fail-safe semantics of the previous `rootPath.includes('stonyx-')` heuristic.
+ */
+export function resolveModuleName(rootPath) {
+    let pkg;
+    try {
+        const raw = readFileSync(`${rootPath}/package.json`, 'utf8');
+        pkg = JSON.parse(raw);
+    }
+    catch {
+        return null;
+    }
+    const name = typeof pkg.name === 'string' ? pkg.name : '';
+    if (name.startsWith('@stonyx/')) {
+        return kebabCaseToCamelCase(name.slice('@stonyx/'.length));
+    }
+    if (name.startsWith('stonyx-')) {
+        return kebabCaseToCamelCase(name.slice('stonyx-'.length));
+    }
+    return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stonyx",
-  "version": "0.2.3-alpha.30",
+  "version": "0.2.3-alpha.32",
   "description": "Base stonyx framework module",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",

package/scripts/postinstall.js

@@ -7,14 +7,31 @@ const { copyFile, createDirectory } = await import('@stonyx/utils/file');
 
 const projectDir = process.env.INIT_CWD;
 const configDir = `${projectDir}/config`;
-const envFile = 'environment.js';
 
-// Skip if the consumer ships its own `config/environment copy.js` template —
-// they manage their own bootstrap (see abofs/stonyx#54).
-if (existsSync(`${configDir}/environment copy.js`)) process.exit(0);
+// Detect consumer project type: presence of `tsconfig.json` in the consumer
+// root signals a TypeScript project (see abofs/stonyx#62). TS consumers can't
+// use the `.js` stub, so we ship both templates and copy the matching one.
+const isTypeScriptConsumer = existsSync(`${projectDir}/tsconfig.json`);
+const extension = isTypeScriptConsumer ? 'ts' : 'js';
+const envFile = `environment.${extension}`;
+const templateFile = `environment copy.${extension}`;
+
+// Skip if the consumer ships its own `config/environment copy.{ts,js}` template —
+// they manage their own bootstrap (see abofs/stonyx#54, extended in abofs/stonyx#62
+// to honor either extension).
+if (
+  existsSync(`${configDir}/environment copy.ts`) ||
+  existsSync(`${configDir}/environment copy.js`)
+) process.exit(0);
+
+// Don't overwrite an existing consumer config (either extension).
+if (
+  existsSync(`${configDir}/environment.ts`) ||
+  existsSync(`${configDir}/environment.js`)
+) process.exit(0);
 
 createDirectory(configDir);
 
-copyFile(`./config/environment copy.js`, `${configDir}/${envFile}`).then(result => {
+copyFile(`./config/${templateFile}`, `${configDir}/${envFile}`).then(result => {
   if (result) console.log(`Stonyx: ${envFile} has been successfully created. Please see README.md for more information.`);
 });