silgi 0.41.4 → 0.41.6

package/dist/cli/build.mjs

@@ -2,7 +2,7 @@ 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, genEnsureSafeVar, getServicePath, writeFile, relativeWithDot, hash, removeExtension, resolveAlias, directoryToURL, baseHeaderBannerComment, addImports, normalizeTemplate, useLogger, resolveSilgiPath, hasSilgiModule, toArray, isDirectory } from 'silgi/kit';
+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';
 import { runtimeDir } from 'silgi/runtime/meta';
 import { scanExports, createUnimport, toExports } from 'unimport';
@@ -1332,127 +1332,6 @@ async function createStorageCLI(silgi) {
   return storage;
 }
 
-const vueShim = {
-  filename: "delete/testtest.d.ts",
-  where: ".silgi",
-  getContents: ({ app }) => {
-    if (!app.options.typescript.shim) {
-      return "";
-    }
-    return [
-      "declare module '*.vue' {",
-      "  import { DefineComponent } from 'vue'",
-      "  const component: DefineComponent<{}, {}, any>",
-      "  export default component",
-      "}"
-    ].join("\n");
-  }
-};
-const pluginsDeclaration = {
-  filename: "delete/testtest1.d.ts",
-  where: ".silgi",
-  getContents: async () => {
-    return `
-      declare module 'nuxt' {
-        interface NuxtApp {
-          $myPlugin: any;
-        }
-      }
-    `;
-  }
-};
-
-const defaultTemplates = {
-  __proto__: null,
-  pluginsDeclaration: pluginsDeclaration,
-  vueShim: vueShim
-};
-
-const postTemplates = [
-  pluginsDeclaration.filename
-];
-const logger = useLogger("silgi");
-async function generateApp(app, options = {}) {
-  app.templates = Object.values(defaultTemplates).concat(app.options.build.templates);
-  await app.callHook("app:templates", app);
-  app.templates = app.templates.map((tmpl) => {
-    const dir = tmpl.where === ".silgi" ? app.options.build.dir : tmpl.where === "server" ? app.options.silgi.serverDir : tmpl.where === "client" ? app.options.silgi.clientDir : app.options.silgi.vfsDir;
-    return normalizeTemplate(tmpl, dir);
-  });
-  const filteredTemplates = {
-    pre: [],
-    post: []
-  };
-  for (const template of app.templates) {
-    if (options.filter && !options.filter(template)) {
-      continue;
-    }
-    const key = template.filename && postTemplates.includes(template.filename) ? "post" : "pre";
-    filteredTemplates[key].push(template);
-  }
-  const templateContext = { app };
-  const writes = [];
-  const dirs = /* @__PURE__ */ new Set();
-  const changedTemplates = [];
-  async function processTemplate(template) {
-    const dir = template.where === ".silgi" ? app.options.build.dir : template.where === "server" ? app.options.silgi.serverDir : template.where === "client" ? app.options.silgi.clientDir : app.options.silgi.vfsDir;
-    const fullPath = template.dst || resolve(dir, template.filename);
-    const start = performance.now();
-    const contents = await compileTemplate(template, templateContext).catch((e) => {
-      logger.error(`Could not compile template \`${template.filename}\`.`);
-      logger.error(e);
-      throw e;
-    });
-    template.modified = true;
-    if (template.modified) {
-      changedTemplates.push(template);
-    }
-    const perf = performance.now() - start;
-    const setupTime = Math.round(perf * 100) / 100;
-    if (app.options.debug || setupTime > 500) {
-      logger.info(`Compiled \`${template.filename}\` in ${setupTime}ms`);
-    }
-    if (template.modified && template.write) {
-      dirs.add(dirname(fullPath));
-      if (template.skipIfExists && existsSync(fullPath)) {
-        return;
-      }
-      writes.push(() => writeFileSync(fullPath, contents, "utf8"));
-    }
-  }
-  await Promise.allSettled(filteredTemplates.pre.map(processTemplate));
-  await Promise.allSettled(filteredTemplates.post.map(processTemplate));
-  for (const dir of dirs) {
-    mkdirSync(dir, { recursive: true });
-  }
-  for (const write of writes) {
-    if (!app.errors.length) {
-      write();
-    }
-  }
-  if (changedTemplates.length) {
-    await app.callHook("app:templatesGenerated", app, changedTemplates, options);
-  }
-}
-async function compileTemplate(template, ctx) {
-  delete ctx.utils;
-  if (template.src) {
-    try {
-      return await promises.readFile(template.src, "utf-8");
-    } catch (err) {
-      logger.error(`[nuxt] Error reading template from \`${template.src}\``);
-      throw err;
-    }
-  }
-  if (template.getContents) {
-    return template.getContents({
-      ...ctx,
-      options: template.options
-    });
-  }
-  throw new Error(`[nuxt] Invalid template. Templates must have either \`src\` or \`getContents\`: ${JSON.stringify(template)}`);
-}
-
 const GLOB_SCAN_PATTERN = "**/*.{js,mjs,cjs,ts,mts,cts,tsx,jsx}";
 async function scanAndSyncOptions(silgi) {
   const scannedModules = await scanModules(silgi);
@@ -1559,7 +1438,6 @@ async function createSilgiCLI(config = {}, opts = {}) {
     silgi.logger.level = silgi.options.logLevel;
   }
   silgi.hooks.addHooks(silgi.options.hooks);
-  await generateApp(silgi);
   if (silgi.options.imports) {
     silgi.options.imports.dirs ??= [];
     silgi.options.imports.dirs = silgi.options.imports.dirs.map((dir) => {
@@ -1626,6 +1504,127 @@ async function generateApiFul(silgi) {
   });
 }
 
+const vueShim = {
+  filename: "delete/testtest.d.ts",
+  where: ".silgi",
+  getContents: ({ app }) => {
+    if (!app.options.typescript.shim) {
+      return "";
+    }
+    return [
+      "declare module '*.vue' {",
+      "  import { DefineComponent } from 'vue'",
+      "  const component: DefineComponent<{}, {}, any>",
+      "  export default component",
+      "}"
+    ].join("\n");
+  }
+};
+const pluginsDeclaration = {
+  filename: "delete/testtest1.d.ts",
+  where: ".silgi",
+  getContents: async () => {
+    return `
+      declare module 'nuxt' {
+        interface NuxtApp {
+          $myPlugin: any;
+        }
+      }
+    `;
+  }
+};
+
+const defaultTemplates = {
+  __proto__: null,
+  pluginsDeclaration: pluginsDeclaration,
+  vueShim: vueShim
+};
+
+const postTemplates = [
+  pluginsDeclaration.filename
+];
+const logger = useLogger("silgi");
+async function generateApp(app, options = {}) {
+  app.templates = Object.values(defaultTemplates).concat(app.options.build.templates);
+  await app.callHook("app:templates", app);
+  app.templates = app.templates.map((tmpl) => {
+    const dir = tmpl.where === ".silgi" ? app.options.build.dir : tmpl.where === "server" ? app.options.silgi.serverDir : tmpl.where === "client" ? app.options.silgi.clientDir : app.options.silgi.vfsDir;
+    return normalizeTemplate(tmpl, dir);
+  });
+  const filteredTemplates = {
+    pre: [],
+    post: []
+  };
+  for (const template of app.templates) {
+    if (options.filter && !options.filter(template)) {
+      continue;
+    }
+    const key = template.filename && postTemplates.includes(template.filename) ? "post" : "pre";
+    filteredTemplates[key].push(template);
+  }
+  const templateContext = { app };
+  const writes = [];
+  const dirs = /* @__PURE__ */ new Set();
+  const changedTemplates = [];
+  async function processTemplate(template) {
+    const dir = template.where === ".silgi" ? app.options.build.dir : template.where === "server" ? app.options.silgi.serverDir : template.where === "client" ? app.options.silgi.clientDir : app.options.silgi.vfsDir;
+    const fullPath = template.dst || resolve(dir, template.filename);
+    const start = performance.now();
+    const contents = await compileTemplate(template, templateContext).catch((e) => {
+      logger.error(`Could not compile template \`${template.filename}\`.`);
+      logger.error(e);
+      throw e;
+    });
+    template.modified = true;
+    if (template.modified) {
+      changedTemplates.push(template);
+    }
+    const perf = performance.now() - start;
+    const setupTime = Math.round(perf * 100) / 100;
+    if (app.options.debug || setupTime > 500) {
+      logger.info(`Compiled \`${template.filename}\` in ${setupTime}ms`);
+    }
+    if (template.modified && template.write) {
+      dirs.add(dirname(fullPath));
+      if (template.skipIfExists && existsSync(fullPath)) {
+        return;
+      }
+      writes.push(() => writeFileSync(fullPath, contents, "utf8"));
+    }
+  }
+  await Promise.allSettled(filteredTemplates.pre.map(processTemplate));
+  await Promise.allSettled(filteredTemplates.post.map(processTemplate));
+  for (const dir of dirs) {
+    mkdirSync(dir, { recursive: true });
+  }
+  for (const write of writes) {
+    if (!app.errors.length) {
+      write();
+    }
+  }
+  if (changedTemplates.length) {
+    await app.callHook("app:templatesGenerated", app, changedTemplates, options);
+  }
+}
+async function compileTemplate(template, ctx) {
+  delete ctx.utils;
+  if (template.src) {
+    try {
+      return await promises.readFile(template.src, "utf-8");
+    } catch (err) {
+      logger.error(`[nuxt] Error reading template from \`${template.src}\``);
+      throw err;
+    }
+  }
+  if (template.getContents) {
+    return template.getContents({
+      ...ctx,
+      options: template.options
+    });
+  }
+  throw new Error(`[nuxt] Invalid template. Templates must have either \`src\` or \`getContents\`: ${JSON.stringify(template)}`);
+}
+
 function debugMode(name) {
   const silgi = useSilgiCLI$1();
   if (silgi.options.debug === true || typeof silgi.options.debug === "object" && silgi.options.debug[name]) {

package/dist/cli/index.mjs

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

package/dist/core/index.mjs

@@ -576,10 +576,10 @@ function getUrlPrefix(path, method) {
   };
 }
 
-async function orchestrate(route, event, _input, graphql) {
+async function orchestrate(route, event, _input) {
   const silgiCtx = useSilgi();
   const silgiURL = getUrlPrefix(route.route || event.req.url, route.method);
-  const input = _input || (route.service?.setup.rules?.readBeforeBody === false || graphql ? {} : await parseRequestInput(event.req));
+  const input = _input || (route.service?.setup.rules?.readBeforeBody === false || route.graphql ? {} : await parseRequestInput(event.req));
   const hookContext = { earlyReturnValue: false };
   const routerParams = _input ? input.path : getRouterParams(event);
   const queryParams = _input ? input.query : getQuery(event);
@@ -988,7 +988,14 @@ async function handler(event, url, input) {
   const data = middleware(event, url);
   _chain = data;
   if (silgiCtx.router) {
-    const match = findRoute(silgiCtx.router, url?.method || event.req.method, pathname);
+    const match = !url?.graphql ? findRoute(silgiCtx.router, url?.method || event.req.method, pathname) : {
+      data: {
+        graphql: true,
+        method: url?.method || event.req.method,
+        route: url.path
+      },
+      params: {}
+    };
     if (match) {
       if (_chain) {
         return _chain.then(async (_previous) => {
@@ -997,12 +1004,12 @@ async function handler(event, url, input) {
           }
           event.context.params = match.params;
           event.context.matchedRoute = match.data;
-          return orchestrate(match.data, event, input, url?.graphql);
+          return orchestrate(match.data, event, input);
         });
       } else {
         event.context.params = match.params;
         event.context.matchedRoute = match.data;
-        return orchestrate(match.data, event, input, url?.graphql);
+        return orchestrate(match.data, event, input);
       }
     }
   }

package/dist/types/index.d.mts

@@ -697,6 +697,7 @@ interface MetaData extends Record<string, unknown> {
 }
 interface SilgiRoute {
     route?: string;
+    graphql?: boolean;
     method?: HTTPMethod | HTTPMethod[];
     service?: ResolvedServiceDefinition[string];
     middleware?: MiddlewareSetup;

package/package.json

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