silgi 0.34.12 → 0.35.0

package/dist/cli/index.mjs

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

package/dist/core/index.mjs

@@ -263,7 +263,7 @@ async function createSilgi(config) {
     routerPrefixs: [],
     schemas: config.schemas ?? {},
     services: config.services ?? {},
-    shared: config.shared ?? void 0,
+    shared: config.shared ?? {},
     plugins: config.plugins ?? [],
     framework: config.framework ?? void 0,
     storage: config.options.putStorage ?? void 0,

package/dist/presets/_all.gen.mjs

@@ -1,10 +1,12 @@
 import _h3  from "./h3/preset.mjs";
+import _hono  from "./hono/preset.mjs";
 import _next  from "./next/preset.mjs";
 import _nitro  from "./nitro/preset.mjs";
 import _npmpackage  from "./npmpackage/preset.mjs";
 import _nuxt  from "./nuxt/preset.mjs";
 const presets = [
   ..._h3,
+  ..._hono,
   ..._next,
   ..._nitro,
   ..._npmpackage,

package/dist/presets/_types.gen.d.mts

@@ -1,5 +1,5 @@
 export interface PresetOptions {
 }
 export declare const presetsWithConfig: readonly [];
-export type PresetName = "h3" | "next" | "nitro" | "npm-package" | "nuxt";
-export type PresetNameInput = "h3" | "next" | "nitro" | "npm-package" | "nuxt";
+export type PresetName = "h3" | "hono" | "next" | "nitro" | "npm-package" | "nuxt";
+export type PresetNameInput = "h3" | "hono" | "next" | "nitro" | "npm-package" | "nuxt";

package/dist/presets/hono/preset.d.mts

@@ -0,0 +1,3 @@
+import type { SilgiPreset } from 'silgi/types';
+declare const presets: readonly SilgiPreset[];
+export default presets;

package/dist/presets/hono/preset.mjs

@@ -0,0 +1,37 @@
+import { defineSilgiPreset } from "silgi/kit";
+const hono = defineSilgiPreset(
+  {
+    // output: {
+    //   dir: '{{ rootDir }}/.output',
+    //   publicDir: '{{ output.dir }}/public',
+    // },
+    serverDir: "{{ rootDir }}/src/server",
+    envOptions: {
+      prefix: "HONO_",
+      altPrefix: "SILGI_"
+    },
+    imports: {
+      dirs: [
+        "!{{ serverDir }}/runtime/**",
+        "!{{ serverDir }}/api/**",
+        "!{{ serverDir }}/routes/**",
+        "!{{ serverDir }}/modules/**",
+        "!{{ serverDir }}/assets/**",
+        "!{{ serverDir }}/public/**",
+        "!{{ silgi.serverDir }}/**"
+      ]
+    },
+    hooks: {
+      ready: async () => {
+      }
+    },
+    storages: []
+  },
+  {
+    name: "hono",
+    static: true,
+    url: import.meta.url
+  }
+);
+const presets = [hono];
+export default presets;

package/dist/presets/next/preset.mjs

@@ -1,4 +1,4 @@
-import { defineSilgiPreset } from "silgi/kit";
+import { addNPMPackage, defineSilgiPreset } from "silgi/kit";
 const next = defineSilgiPreset(
   {
     // output: {
@@ -8,7 +8,7 @@ const next = defineSilgiPreset(
     serverDir: "{{ rootDir }}/src/server",
     envOptions: {
       prefix: "NEXT_",
-      altPrefix: "NUXT_"
+      altPrefix: "SILGI_"
     },
     imports: {
       dirs: [
@@ -23,6 +23,10 @@ const next = defineSilgiPreset(
     },
     hooks: {
       ready: async () => {
+        await addNPMPackage({
+          name: "defu",
+          isDev: true
+        });
       }
     },
     storages: []

package/dist/runtime/internal/next.d.mts

@@ -1,4 +1,4 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
+import type { NextApiResponse } from 'next';
 import type { Silgi } from 'silgi/types';
-export declare function addNextApp(silgiContext?: Silgi): (req: NextApiRequest | Request, res?: NextApiResponse) => Promise<void | NextApiResponse<any> | Response>;
+export declare function addNextApp(silgiContext?: Silgi): (request: Request) => Promise<void | NextApiResponse<any> | Response>;
 export default addNextApp;

package/dist/runtime/internal/next.mjs

@@ -1,71 +1,65 @@
-import { createError, handleResponse, isError, useSilgi } from "silgi";
-import { getQuery, withoutHost } from "ufo";
+import { createError, getUrlPrefix, isError, silgiFetch, useSilgi } from "silgi";
 export function addNextApp(silgiContext = useSilgi()) {
-  return async (req, res) => {
+  return async (request) => {
     if (!silgiContext) {
       throw new Error("Silgi context is not defined");
     }
-    let operation;
+    const silgiURL = getUrlPrefix(request.url, request.method);
     try {
-      const silgiConnect = silgi({
-        req,
-        res,
-        context: {},
-        url: new URL(req.url || "", "http://localhost")
-      });
-      const query = getQuery(req.url || "");
-      const body = req.body;
-      let newPath = withoutHost(req.url || "").replace(/\/srn/, "");
-      if (newPath.includes("?")) {
-        newPath = `${newPath}&method=${req.method}`;
-      } else {
-        newPath = `${newPath}?method=${req.method}`;
-      }
-      operation = parseURI(newPath, silgiContext.uris);
-      if (!operation) {
+      const resolvedRoute = await silgiFetch(request);
+      if (!resolvedRoute.ok) {
+        await silgiContext.callHook("fetch:error", {
+          error: new Error(resolvedRoute.statusText),
+          url: silgiURL
+        });
+        silgiContext.captureError(
+          silgiContext,
+          createError({
+            message: resolvedRoute.statusText,
+            statusCode: resolvedRoute.status,
+            statusMessage: resolvedRoute.statusText
+          }),
+          {
+            url: silgiURL,
+            tags: ["execute"]
+          }
+        );
         throw createError({
-          statusCode: 400,
-          statusMessage: "Invalid URI"
+          statusCode: resolvedRoute.status,
+          statusMessage: resolvedRoute.statusText
         });
       }
-      await silgiContext.callHook("event:init", req, {
-        path: newPath,
-        queryParams: query,
-        operation
-      });
-      const data = await silgiConnect.execute(newPath, {
-        ...body
-      }, void 0, query);
-      return handleResponse(data, {
-        req,
-        res,
-        context: {},
-        url: new URL(req.url || "", "http://localhost")
-      }, {
-        debug: false
-      });
+      return resolvedRoute;
     } catch (err) {
       if (isError(err)) {
+        throw createError({
+          statusCode: 500,
+          statusMessage: "Internal Server Error",
+          cause: err
+        });
       }
-      await silgiContext.callHook("execute:error", {
+      await silgiContext.callHook("fetch:error", {
         error: err instanceof Error ? err : new Error(String(err)),
-        timestamp: Date.now(),
-        operation
-        // event: event as never,
+        url: silgiURL
       });
       silgiContext.captureError(
         silgiContext,
         createError({
           message: err instanceof Error ? err.message : String(err),
           statusCode: 500,
-          statusMessage: "Internal Server Error"
+          statusMessage: "Internal Server Error",
+          cause: err
         }),
         {
-          event,
-          operation,
+          url: silgiURL,
           tags: ["execute"]
         }
       );
+      throw createError({
+        statusCode: 500,
+        message: "Internal Server Error",
+        cause: err
+      });
     }
   };
 }

package/dist/types/index.d.mts

@@ -7,7 +7,7 @@ import { Hookable, NestedHooks } from 'hookable';
 import { Ignore, Options } from 'ignore';
 import { TSConfig } from 'pkg-types';
 import { PresetName, PresetOptions, PresetNameInput } from 'silgi/presets';
-import { SilgiRuntimeShareds as SilgiRuntimeShareds$1, ModuleMeta as ModuleMeta$1, SilgiModule as SilgiModule$1, BuildSilgi as BuildSilgi$1, SilgiSchema as SilgiSchema$1, SilgiEvent as SilgiEvent$1, SilgiRuntimeActions as SilgiRuntimeActions$1, StorageConfig as StorageConfig$1, Commands as Commands$1, DotenvOptions as DotenvOptions$1, EnvOptions as EnvOptions$1, SilgiRuntimeConfig as SilgiRuntimeConfig$1, SilgiCLIHooks as SilgiCLIHooks$1, StorageMounts as StorageMounts$1, SilgiTemplate as SilgiTemplate$1, SilgiFrameworkInfo as SilgiFrameworkInfo$1 } from 'silgi/types';
+import { ResolvedServiceDefinition as ResolvedServiceDefinition$1, SilgiRuntimeShareds as SilgiRuntimeShareds$1, ModuleMeta as ModuleMeta$1, SilgiModule as SilgiModule$1, BuildSilgi as BuildSilgi$1, SilgiSchema as SilgiSchema$1, SilgiEvent as SilgiEvent$1, SilgiRuntimeActions as SilgiRuntimeActions$1, StorageConfig as StorageConfig$1, Commands as Commands$1, DotenvOptions as DotenvOptions$1, EnvOptions as EnvOptions$1, SilgiRuntimeConfig as SilgiRuntimeConfig$1, SilgiCLIHooks as SilgiCLIHooks$1, StorageMounts as StorageMounts$1, SilgiTemplate as SilgiTemplate$1, SilgiFrameworkInfo as SilgiFrameworkInfo$1 } from 'silgi/types';
 import { Adapter, TablesSchema, InferModelTypes } from 'unadapter/types';
 import { UnimportPluginOptions } from 'unimport/unplugin';
 import * as h3 from 'h3';
@@ -73,7 +73,7 @@ interface SilgiCLI {
         type: 'Parser';
         path?: string;
     }[];
-    services: ResolvedServiceDefinition;
+    services: ResolvedServiceDefinition$1;
     shareds: SilgiRuntimeShareds$1;
     schemas: Record<string, any>;
     scannedURIs: Map<string, string>;
@@ -381,7 +381,7 @@ interface ServiceSetup<Schema extends SilgiSchema$1 = SilgiSchema$1, Route exten
  * This interface is designed to be compatible with the structure created
  * by the createService function.
  */
-interface ResolvedServiceDefinition$1 {
+interface ResolvedServiceDefinition {
     [routePath: string]: {
         [method: string]: {
             handler: (...args: any[]) => Promise<any>;
@@ -1013,7 +1013,7 @@ interface Silgi {
     router: RouterContext<SilgiRoute>;
     routerPrefixs: string[];
     schemas: ResolvedSchemaDefinition;
-    services: ResolvedServiceDefinition$1;
+    services: ResolvedServiceDefinition;
     shared: SilgiRuntimeShareds;
     plugins: SilgiAppPlugin[];
     framework: FrameworkContext;
@@ -1188,4 +1188,4 @@ interface GraphQLJSON {
     references: any;
 }
 
-export type { AllPaths, AllPrefixes, AppConfig, Awaitable, BuildSilgi, CaptureError, CapturedErrorContext, CommandType, Commands, CustomRequestInit, DeepPartial, DeepRequired, DefaultHooks, DefineFrameworkOptions, DotenvOptions, EnvOptions, EventHandlerResponse, ExtendContext, ExtendShared, ExtractNamespace, ExtractPathParamKeys, ExtractPathParams, ExtractPrefix, ExtractRoute, FrameworkContext, GenImport, GenerateAppOptions, GraphQLJSON, HTTPMethod, HookResult, HttpMethod, LoadConfigOptions, MergeAll, MergedSilgiSchema, MethodSchemas, ModuleDefinition, ModuleHookContext, ModuleMeta, ModuleOptionsCustom, ModuleSetupInstallResult, ModuleSetupReturn, NamespacesForPrefix, NitroBuildInfo, RequiredServiceType, ResolvedModuleMeta, ResolvedModuleOptions, ResolvedSchema, ResolvedSchemaDefinition, ResolvedServiceDefinition$1 as ResolvedServiceDefinition, ResolvedSilgiTemplate, RouteConfig, RouterParams, Routers, RoutesForPrefixAndNamespace, ScanFile, Schema, ServiceHandler, ServiceHandlerInput, ServiceHandlerOutput, ServiceHandlerSource, ServiceMethods, ServiceSetup, Silgi, SilgiAppPlugin, SilgiCLI, SilgiCLIConfig, SilgiCLIDynamicConfig, SilgiCLIHooks, SilgiCLIOptions, SilgiCommands, SilgiCompatibility, SilgiCompatibilityIssue, SilgiCompatibilityIssues, SilgiConfig, SilgiEvent, SilgiFetchClient, SilgiFetchOptions, SilgiFrameworkInfo, SilgiHooks, SilgiModule, SilgiModuleInput, SilgiModuleOptions, SilgiOptions, SilgiPreset, SilgiPresetMeta, SilgiRoute, SilgiRouterTypes, SilgiRuntimeActions, SilgiRuntimeConfig, SilgiRuntimeContext, SilgiRuntimeHooks, SilgiRuntimeMethods, SilgiRuntimeOptions, SilgiRuntimeShareds, SilgiRuntimeSharedsExtend, SilgiSchema, SilgiStorageBase, SilgiTemplate, SilgiURL, StandardHTTPMethod, StorageConfig, StorageKeyGenerator, StorageKeyParams, StorageMounts, TSReference, TrimAfterFourSlashes, WithPathParams };
+export type { AllPaths, AllPrefixes, AppConfig, Awaitable, BuildSilgi, CaptureError, CapturedErrorContext, CommandType, Commands, CustomRequestInit, DeepPartial, DeepRequired, DefaultHooks, DefineFrameworkOptions, DotenvOptions, EnvOptions, EventHandlerResponse, ExtendContext, ExtendShared, ExtractNamespace, ExtractPathParamKeys, ExtractPathParams, ExtractPrefix, ExtractRoute, FrameworkContext, GenImport, GenerateAppOptions, GraphQLJSON, HTTPMethod, HookResult, HttpMethod, LoadConfigOptions, MergeAll, MergedSilgiSchema, MethodSchemas, ModuleDefinition, ModuleHookContext, ModuleMeta, ModuleOptionsCustom, ModuleSetupInstallResult, ModuleSetupReturn, NamespacesForPrefix, NitroBuildInfo, RequiredServiceType, ResolvedModuleMeta, ResolvedModuleOptions, ResolvedSchema, ResolvedSchemaDefinition, ResolvedServiceDefinition, ResolvedSilgiTemplate, RouteConfig, RouterParams, Routers, RoutesForPrefixAndNamespace, ScanFile, Schema, ServiceHandler, ServiceHandlerInput, ServiceHandlerOutput, ServiceHandlerSource, ServiceMethods, ServiceSetup, Silgi, SilgiAppPlugin, SilgiCLI, SilgiCLIConfig, SilgiCLIDynamicConfig, SilgiCLIHooks, SilgiCLIOptions, SilgiCommands, SilgiCompatibility, SilgiCompatibilityIssue, SilgiCompatibilityIssues, SilgiConfig, SilgiEvent, SilgiFetchClient, SilgiFetchOptions, SilgiFrameworkInfo, SilgiHooks, SilgiModule, SilgiModuleInput, SilgiModuleOptions, SilgiOptions, SilgiPreset, SilgiPresetMeta, SilgiRoute, SilgiRouterTypes, SilgiRuntimeActions, SilgiRuntimeConfig, SilgiRuntimeContext, SilgiRuntimeHooks, SilgiRuntimeMethods, SilgiRuntimeOptions, SilgiRuntimeShareds, SilgiRuntimeSharedsExtend, SilgiSchema, SilgiStorageBase, SilgiTemplate, SilgiURL, StandardHTTPMethod, StorageConfig, StorageKeyGenerator, StorageKeyParams, StorageMounts, TSReference, TrimAfterFourSlashes, WithPathParams };

package/package.json

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