silgi 0.34.11 → 0.34.13

package/dist/build.mjs

@@ -14,6 +14,7 @@ import 'unimport';
 import '@clack/prompts';
 import 'node:fs';
 import 'dotenv';
+import 'knitwork';
 import 'mlly';
 import 'dev-jiti';
 import './cli/compatibility.mjs';
@@ -26,7 +27,6 @@ import 'ufo';
 import 'node:fs/promises';
 import 'globby';
 import 'ignore';
-import 'knitwork';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';

package/dist/cli/build.mjs

@@ -2,12 +2,13 @@ import { consola } from 'consola';
 import { createHooks, createDebugger } from 'hookable';
 import { resolve, join, relative, extname, basename, dirname, isAbsolute } from 'pathe';
 import { useSilgiCLI, replaceRuntimeValues, silgiCLICtx, autoImportTypes } from 'silgi';
-import { isPresents, addTemplate, addCoreFile, relativeWithDot, hash, removeExtension, resolveAlias, directoryToURL, addImports, baseHeaderBannerComment, writeFile, normalizeTemplate, useLogger, resolveSilgiPath, hasSilgiModule, genEnsureSafeVar, toArray, isDirectory } from 'silgi/kit';
+import { isPresents, addTemplate, addCoreFile, genEnsureSafeVar, relativeWithDot, hash, removeExtension, resolveAlias, directoryToURL, addImports, baseHeaderBannerComment, writeFile, normalizeTemplate, useLogger, resolveSilgiPath, hasSilgiModule, toArray, isDirectory } from 'silgi/kit';
 import { runtimeDir } from 'silgi/runtime/meta';
 import { scanExports, createUnimport, toExports } from 'unimport';
 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 { findTypeExports, findExports, resolvePath, parseNodeModulePath, lookupNodeModuleSubpath } from 'mlly';
 import { createJiti } from 'dev-jiti';
 import { h as hasInstalledModule } from './compatibility.mjs';
@@ -18,7 +19,6 @@ import { withTrailingSlash, isRelative } from 'ufo';
 import { readFile, readdir } from 'node:fs/promises';
 import { globby } from 'globby';
 import ignore from 'ignore';
-import { genImport, genTypeImport, genAugmentation, genObjectFromRawEntries } from 'knitwork';
 import { klona } from 'klona';
 import { useSilgiRuntimeConfig, initRuntimeConfig } from 'silgi/runtime';
 import { createStorage, builtinDrivers } from 'unstorage';
@@ -223,6 +223,52 @@ async function h3Framework(silgi, skip = false) {
   }
 }
 
+async function nextJS(silgi, skip = false) {
+  if (!isPresents(["next"]) && skip === false)
+    return;
+  if (isPresents(["next"])) {
+    silgi.hook("after:schema.ts", (data) => {
+      data.unshift("type FrameworkContextExtends = {}");
+    });
+  }
+  const defaultConfig = {
+    serverExternalPackages: [
+      "mlly",
+      "silgi",
+      "h3",
+      "@silgi/openapi",
+      "@silgi/scalar",
+      "@silgi/ecosystem"
+    ],
+    eslint: {
+      ignoreDuringBuilds: true
+    },
+    output: "standalone"
+  };
+  await silgi.callHook("nextjs:prepare", {
+    config: defaultConfig
+  });
+  const template = [
+    genImport("defu", ["defu"]),
+    genTypeImport("next", ["NextConfig"]),
+    "export function withNextConfig(config: NextConfig) {",
+    "return defu(config,",
+    // TODO: make the output code more properly intend.
+    genObjectFromRawEntries(
+      Object.entries(defaultConfig).map(([key, value]) => [key, genEnsureSafeVar(value)]),
+      ""
+    ),
+    ")}",
+    ""
+  ];
+  addTemplate({
+    filename: "next.config.ts",
+    where: ".silgi",
+    write: true,
+    getContents: () => template.join("\n")
+  });
+}
+
 async function nitroFramework(silgi, skip = false) {
   if (!isPresents(["nitro"]) && skip === false)
     return;
@@ -276,7 +322,8 @@ const frameworkSetup = [
   emptyFramework,
   h3Framework,
   nitroFramework,
-  nuxtFramework
+  nuxtFramework,
+  nextJS
 ];
 
 async function registerModuleExportScan(silgi) {
@@ -1382,14 +1429,14 @@ async function createSilgiCLI(config = {}, opts = {}) {
       packageImport: "silgi/runtime/internal/debug"
     });
   }
-  for (const framework of frameworkSetup) {
-    await framework(silgi);
-  }
   await scanAndSyncOptions(silgi);
   await scanModules$1(silgi);
   await scanSilgiExports();
   await installModules(silgi, true);
   useCLIRuntimeConfig(silgi);
+  for (const framework of frameworkSetup) {
+    await framework(silgi);
+  }
   await writeScanFiles(silgi);
   silgi.storage = await createStorageCLI(silgi);
   silgi.hooks.hook("close", async () => {

package/dist/cli/index.mjs

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

package/dist/cli/init.mjs

@@ -13,6 +13,7 @@ import 'silgi/kit';
 import 'silgi/runtime/meta';
 import 'unimport';
 import 'dotenv';
+import 'knitwork';
 import 'mlly';
 import 'dev-jiti';
 import './compatibility.mjs';
@@ -23,7 +24,6 @@ import 'exsolve';
 import 'ufo';
 import 'globby';
 import 'ignore';
-import 'knitwork';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';

package/dist/cli/install.mjs

@@ -15,6 +15,7 @@ import 'unimport';
 import '@clack/prompts';
 import 'node:fs';
 import 'dotenv';
+import 'knitwork';
 import 'mlly';
 import 'dev-jiti';
 import './compatibility.mjs';
@@ -26,7 +27,6 @@ import 'ufo';
 import 'node:fs/promises';
 import 'globby';
 import 'ignore';
-import 'knitwork';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';

package/dist/cli/watch.mjs

@@ -17,6 +17,7 @@ import 'unimport';
 import '@clack/prompts';
 import 'node:fs';
 import 'dotenv';
+import 'knitwork';
 import 'mlly';
 import 'dev-jiti';
 import './compatibility.mjs';
@@ -28,7 +29,6 @@ import 'ufo';
 import 'node:fs/promises';
 import 'globby';
 import 'ignore';
-import 'knitwork';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';

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/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';
@@ -15,8 +15,9 @@ import { H3Event, HTTPMethod as HTTPMethod$1, Session } from 'h3';
 import * as nitropack_types from 'nitropack/types';
 import { NitroRuntimeConfig } from 'nitropack/types';
 import { Defu } from 'defu';
-import { Stats } from 'node:fs';
 import * as next from 'next';
+import { NextConfig } from 'next';
+import { Stats } from 'node:fs';
 import { ESMImport, ESMCodeGenOptions } from 'knitwork';
 import { Unimport } from 'unimport';
 import { Storage, TransactionOptions, BuiltinDriverName, StorageValue } from 'unstorage';
@@ -72,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>;
@@ -304,6 +305,9 @@ interface SilgiCLIHooks extends SilgiHooks {
     'app:templatesGenerated': (app: SilgiCLI, templates: ResolvedSilgiTemplate[], options?: GenerateAppOptions) => HookResult;
     'scanFiles:done': (app: SilgiCLI) => HookResult;
     'prepare:commands': (commands: Commands[]) => HookResult;
+    'nextjs:prepare': (data: {
+        config: NextConfig;
+    }) => HookResult;
 }
 type TSReference = {
     types: string;
@@ -377,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>;
@@ -1009,7 +1013,7 @@ interface Silgi {
     router: RouterContext<SilgiRoute>;
     routerPrefixs: string[];
     schemas: ResolvedSchemaDefinition;
-    services: ResolvedServiceDefinition$1;
+    services: ResolvedServiceDefinition;
     shared: SilgiRuntimeShareds;
     plugins: SilgiAppPlugin[];
     framework: FrameworkContext;
@@ -1184,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.11",
+  "version": "0.34.13",
   "private": false,
   "sideEffects": false,
   "exports": {