silgi 0.41.62 → 0.42.0

package/dist/cli/build.mjs

@@ -744,10 +744,29 @@ async function extractExportEntitiesFromFile(absoluteFilePath, functionExportNam
       if (Array.isArray(decls)) {
         for (const decl of decls) {
           if (decl.type === "VariableDeclarator" && decl.id.type === "Identifier" && decl.init && decl.init.type === "CallExpression" && decl.init.callee.type === "Identifier" && functionExportNames.includes(decl.init.callee.name)) {
+            let servicePath;
+            let serviceMethod;
+            if (decl.init.callee.name === "createService") {
+              const firstArg = decl.init.arguments?.[0];
+              if (firstArg && firstArg.type === "ObjectExpression" && Array.isArray(firstArg.properties)) {
+                for (const prop of firstArg.properties) {
+                  if (prop.type === "Property" && prop.key.type === "Identifier") {
+                    if (prop.key.name === "path" && prop.value.type === "Literal" && typeof prop.value.value === "string") {
+                      servicePath = prop.value.value;
+                    }
+                    if (prop.key.name === "method" && prop.value.type === "Literal" && typeof prop.value.value === "string") {
+                      serviceMethod = prop.value.value;
+                    }
+                  }
+                }
+              }
+            }
             exportEntities.push({
               name: decl.id.name,
               type: "function",
-              funcName: decl.init.callee.name
+              funcName: decl.init.callee.name,
+              servicePath,
+              serviceMethod
             });
           }
         }
@@ -815,6 +834,21 @@ async function scanSilgiExports(path, packageName, silgiInstance = useSilgiCLI()
           functionExportNames,
           interfaceExtendsNames
         );
+        const seenServiceSignatures = /* @__PURE__ */ new Map();
+        for (const entity of exportEntities) {
+          if (entity.funcName === "createService" && entity.servicePath && entity.serviceMethod) {
+            const key = `${entity.serviceMethod}:${entity.servicePath}`;
+            if (seenServiceSignatures.has(key)) {
+              throw new Error(
+                `Duplicate createService detected for path "${entity.servicePath}" and method "${entity.serviceMethod}".
+First found in: ${seenServiceSignatures.get(key)}
+Duplicate in: ${absoluteFilePath}
+Please ensure each service path/method combination is unique.`
+              );
+            }
+            seenServiceSignatures.set(key, absoluteFilePath);
+          }
+        }
         const allExportedEntities = exportEntities;
         const { runtimeExports, typeExports } = categorizeExports(
           allExportedEntities,

package/dist/cli/index.mjs

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

package/dist/core/index.d.mts

@@ -3,6 +3,7 @@ import { ServerRequest, ServerRuntimeContext } from 'srvx';
 import { UseContext } from 'unctx';
 import { Storage, StorageValue } from 'unstorage';
 export { c as createMiddleware } from '../shared/silgi.DTwQEdSr.mjs';
+import { Hooks } from 'crossws';
 
 declare function updateRuntimeStorage(runtime: any): void;
 /**
@@ -304,8 +305,8 @@ declare function createSchema<Key extends string, Schema extends BaseMethodSchem
  * ServiceSetup tipinden oluşan bir yardımcı fonksiyon.
  * Tip güvenliğini artırmak için ServiceSetup objesini doğrudan döndürür.
  */
-declare function defineServiceSetup<Method extends HTTPMethod, Path extends keyof Routers, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false>(setup: Omit<ServiceSetup<Method, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>, 'method' | 'path'>): Omit<ServiceSetup<Method, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>, 'method' | 'path'>;
-declare function createService<Path extends string, Method extends HTTPMethod, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false>(params: ServiceSetupsForMethods<Method, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>): ServiceDefinitionByMethodAndPath<Path, Method, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+declare function defineServiceSetup<Method extends HTTPMethod, Path extends keyof Routers, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false, Websocket extends Partial<Hooks> | undefined = undefined>(setup: Omit<ServiceSetup<Method, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters, Websocket>, 'method' | 'path'>): Omit<ServiceSetup<Method, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters, Websocket>, 'method' | 'path'>;
+declare function createService<Path extends string, Method extends HTTPMethod, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false, Websocket extends Partial<Hooks> | undefined = undefined>(params: ServiceSetupsForMethods<Method, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters, Websocket>): ServiceDefinitionByMethodAndPath<Path, Method, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters, Websocket>;
 
 declare function createShared(shared: Partial<SilgiRuntimeShareds>): SilgiRuntimeShareds;
 

package/dist/index.d.mts

@@ -4,3 +4,4 @@ import 'silgi/types';
 import 'srvx';
 import 'unctx';
 import 'unstorage';
+import 'crossws';

package/dist/types/index.d.mts

@@ -23,7 +23,7 @@ import { TransactionOptions, BuiltinDriverName, StorageValue, Storage } from 'un
 import { ServerRequest } from 'srvx';
 import { C as CreateMiddlewareResult } from '../shared/silgi.DTwQEdSr.mjs';
 import { Defu } from 'defu';
-import * as crossws from 'crossws';
+import { Hooks, ResolveHooks } from 'crossws';
 import { silgiFetch } from 'silgi';
 import { useRuntimeConfig } from 'silgi/runtime';
 import { Unimport } from 'unimport';
@@ -292,9 +292,9 @@ declare namespace StandardSchemaV1 {
 interface ServicesObject {
 }
 interface WebSocketOptions {
-    resolve?: crossws.ResolveHooks;
-    hooks?: Partial<crossws.Hooks>;
-    adapterHooks?: Partial<crossws.Hooks>;
+    resolve?: ResolveHooks;
+    hooks?: Partial<Hooks>;
+    adapterHooks?: Partial<Hooks>;
 }
 type SlashCount<S extends string, Count extends any[] = []> = S extends `${infer _Prefix}/${infer Rest}` ? SlashCount<Rest, [any, ...Count]> : Count['length'];
 type Max4Slashes<S extends keyof Routers> = SlashCount<S> extends 0 | 1 | 2 | 3 ? S : never;
@@ -332,11 +332,11 @@ type ServiceHandler<Input extends StandardSchemaV1, Output extends StandardSchem
 /**
  * Servis setup tipi
  */
-interface ServiceSetup<Method extends HTTPMethod = HTTPMethod, Path extends string = string, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false> {
+interface ServiceSetup<Method extends HTTPMethod = HTTPMethod, Path extends string = string, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false, Websocket extends Partial<Hooks> | undefined = undefined> {
     path: Path;
     method?: Method;
     handler?: ServiceHandler<Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
-    websocket?: Partial<crossws.Hooks>;
+    websocket?: Websocket;
     rules?: MergeRouteRules;
     modules?: Partial<SetupModuleOption>;
     storage?: StorageConfig<ServiceHandlerInput<Input, PathParams, QueryParams, HiddenParameters>>;
@@ -369,7 +369,8 @@ interface SilgiURL {
     pathParams?: Record<string, string | undefined>;
     queryParams?: Record<string, string>;
 }
-type ServiceSetupsForMethods<Method extends HTTPMethod = HTTPMethod, Path extends string = string, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false> = ServiceSetup<Method, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+type IsWebsocketEnabled<T> = [T] extends [undefined] | [never] ? false : true;
+type ServiceSetupsForMethods<Method extends HTTPMethod = HTTPMethod, Path extends string = string, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false, Websocket extends Partial<Hooks> | undefined = undefined> = ServiceSetup<Method, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters, Websocket>;
 /**
  * Sadece belirtilen HTTP methodları için anahtar üretir.
  * Varsayılan olarak tüm methodlar çıkar.
@@ -378,8 +379,8 @@ type ServiceSetupsForMethods<Method extends HTTPMethod = HTTPMethod, Path extend
  *   ServiceDefinitionByMethodAndPath<'/foo', ..., 'GET' | 'POST'>
  *   // Sadece "GET:/foo" ve "POST:/foo" anahtarları olur.
  */
-type ServiceDefinitionByMethodAndPath<Path extends string, Method extends HTTPMethod = HTTPMethod, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false> = {
-    [M in Method as `${M}:${Path}`]: ServiceSetup<M, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+type ServiceDefinitionByMethodAndPath<Path extends string, Method extends HTTPMethod = HTTPMethod, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false, Websocket extends Partial<Hooks> | undefined = undefined> = {
+    [M in Method as IsWebsocketEnabled<Websocket> extends true ? `websocket:${M}:${Path}` : `http:${M}:${Path}`]: ServiceSetup<M, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters, Websocket>;
 };
 
 interface SilgiCLI {

package/package.json

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