silgi 0.41.39 → 0.41.41

package/dist/build.mjs

@@ -16,6 +16,7 @@ import '@clack/prompts';
 import 'node:fs';
 import 'dotenv';
 import 'knitwork';
+import 'node:path';
 import 'mlly';
 import 'dev-jiti';
 import './cli/compatibility.mjs';

package/dist/cli/build.mjs

@@ -1,6 +1,6 @@
 import { consola } from 'consola';
 import { createHooks, createDebugger } from 'hookable';
-import { resolve, join, relative, extname, basename, dirname, isAbsolute } from 'pathe';
+import { resolve, join, relative, extname, basename, dirname as dirname$1, isAbsolute } from 'pathe';
 import { useSilgiCLI, replaceRuntimeValues, silgiCLICtx, autoImportTypes } from 'silgi';
 import { isPresents, addTemplate, addCoreFile, genEnsureSafeVar, getServicePath, writeFile, relativeWithDot, hash, removeExtension, resolveAlias, directoryToURL, baseHeaderBannerComment, addImports, resolveSilgiPath, hasSilgiModule, normalizeTemplate, useLogger, toArray, isDirectory } from 'silgi/kit';
 import { initRuntimeConfig, useRuntimeConfig, sharedRuntimeConfig } from 'silgi/runtime';
@@ -10,6 +10,7 @@ import * as p from '@clack/prompts';
 import { existsSync, promises, readFileSync, mkdirSync, writeFileSync } from 'node:fs';
 import * as dotenv from 'dotenv';
 import { genImport, genTypeImport, genObjectFromRawEntries, genAugmentation } from 'knitwork';
+import { join as join$1, dirname } from 'node:path';
 import { findTypeExports, findExports, resolvePath, parseNodeModulePath, lookupNodeModuleSubpath } from 'mlly';
 import { createJiti } from 'dev-jiti';
 import { h as hasInstalledModule } from './compatibility.mjs';
@@ -326,7 +327,7 @@ async function registerModuleExportScan(silgi) {
       if (!module.entryPath) {
         continue;
       }
-      const path = module.meta._packageName ? module.entryPath.replace(/\.mjs$/, "Types.d.mts") : module.entryPath;
+      const path = module.meta._packageName ? join$1(dirname(module.entryPath), "types/index.d.mts") : module.entryPath;
       const moduleTypes = await promises.readFile(path, "utf8").catch(() => "");
       const normalisedModuleTypes = moduleTypes.replace(/export\s*\{.*?\}/gs, (match) => match.replace(/\b(type|interface)\b/g, ""));
       for (const e of findTypeExports(normalisedModuleTypes)) {
@@ -690,7 +691,7 @@ function registerExportsWithHooks(silgiInstance, runtimeExports, typeExports, pa
 }
 async function verifyDirectoryCaseSensitivity(directoryPath, rootDirectory) {
   const directoryName = basename(directoryPath);
-  const parentDirectory = dirname(directoryPath);
+  const parentDirectory = dirname$1(directoryPath);
   try {
     const siblingEntries = await readdir(parentDirectory);
     if (!siblingEntries.includes(directoryName)) {
@@ -1585,7 +1586,7 @@ async function generateApp(app, options = {}) {
       logger.info(`Compiled \`${template.filename}\` in ${setupTime}ms`);
     }
     if (template.modified && template.write) {
-      dirs.add(dirname(fullPath));
+      dirs.add(dirname$1(fullPath));
       if (template.skipIfExists && existsSync(fullPath)) {
         return;
       }

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 
-const version = "0.41.39";
+const version = "0.41.41";
 const packageJson = {
 	version: version};
 

package/dist/cli/init.mjs

@@ -15,6 +15,7 @@ import 'silgi/runtime/meta';
 import 'unimport';
 import 'dotenv';
 import 'knitwork';
+import 'node:path';
 import 'mlly';
 import 'dev-jiti';
 import './compatibility.mjs';

package/dist/cli/install.mjs

@@ -18,6 +18,7 @@ import '@clack/prompts';
 import 'node:fs';
 import 'dotenv';
 import 'knitwork';
+import 'node:path';
 import 'mlly';
 import 'dev-jiti';
 import './compatibility.mjs';

package/dist/cli/run.mjs

@@ -21,6 +21,7 @@ import '@clack/prompts';
 import 'node:fs';
 import 'dotenv';
 import 'knitwork';
+import 'node:path';
 import 'mlly';
 import 'dev-jiti';
 import './compatibility.mjs';

package/dist/cli/watch.mjs

@@ -20,6 +20,7 @@ import '@clack/prompts';
 import 'node:fs';
 import 'dotenv';
 import 'knitwork';
+import 'node:path';
 import 'mlly';
 import 'dev-jiti';
 import './compatibility.mjs';

package/dist/runtime/internal/nitro.mjs

@@ -29,7 +29,7 @@ export async function addNitroApp(silgiContext = useSilgi()) {
   }
   const webhookServices = Object.entries(silgiContext.services).filter(([key]) => key.startsWith("websocket:")).map(([, value]) => value);
   for (const webhook of webhookServices) {
-    nitro.router.use(webhook.path, defineWebSocketHandler(webhook.websocket?.hooks || {}));
+    nitro.router.use(webhook.path, defineWebSocketHandler(webhook.websocket || {}));
   }
 }
 export default addNitroApp;

package/dist/types/index.d.mts

@@ -713,7 +713,7 @@ interface ServiceSetup<Method extends HTTPMethod = HTTPMethod, Path extends stri
     path: Path;
     method?: Method;
     handler?: ServiceHandler<Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
-    websocket?: WebSocketOptions;
+    websocket?: Partial<Hooks>;
     rules?: MergeRouteRules;
     modules?: Partial<SetupModuleOption>;
     storage?: StorageConfig<ServiceHandlerInput<Input, PathParams, QueryParams, HiddenParameters>>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.41.39",
+  "version": "0.41.41",
   "private": false,
   "sideEffects": false,
   "exports": {