silgi 0.9.0 → 0.9.2

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.9.0";
+const version = "0.9.2";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.3.0",
 	"@nuxt/kit": "^3.15.4",

package/dist/cli/prepare.mjs

@@ -1,13 +1,13 @@
 import { defineCommand } from 'citty';
 import consola, { consola as consola$1 } from 'consola';
-import { join, resolve, isAbsolute, relative, dirname, basename, extname } from 'pathe';
+import { resolve, isAbsolute, relative, join, dirname, basename, extname } from 'pathe';
 import { devDependencies, version } from 'silgi/meta';
-import { runtimeDir } from 'silgi/runtime/meta';
 import { promises, existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
 import { readdir } from 'node:fs/promises';
-import { resolvePath, parseNodeModulePath, lookupNodeModuleSubpath, resolve as resolve$1 } from 'mlly';
+import { resolvePath, parseNodeModulePath, lookupNodeModuleSubpath, resolveModuleExportNames, resolve as resolve$1 } from 'mlly';
 import { resolveAlias } from 'pathe/utils';
 import { relativeWithDot, isDirectory, writeFile, resolveAlias as resolveAlias$1, resolvePath as resolvePath$1, normalizeTemplate, useLogger, addTemplate } from 'silgi/kit';
+import { runtimeDir } from 'silgi/runtime/meta';
 import { toExports, scanExports, createUnimport } from 'unimport';
 import { execSync } from 'node:child_process';
 import { createJiti } from 'dev-jiti';
@@ -36,109 +36,6 @@ import 'std-env';
 import 'consola/utils';
 import 'escape-string-regexp';
 
-async function emptyFramework(silgi) {
-  if (silgi.options.preset === "npm-package" || !silgi.options.preset) {
-    silgi.hook("after:prepare:schema.ts", (data) => {
-      data.unshift("type FrameworkContextExtends = {}");
-    });
-  }
-}
-
-async function h3Framework(silgi, skip = false) {
-  if (silgi.options.preset !== "h3" && skip === false)
-    return;
-  if (silgi.options.preset === "h3") {
-    silgi.hook("after:prepare:schema.ts", (data) => {
-      data.unshift("type FrameworkContextExtends = NitroApp");
-    });
-  }
-  silgi.hook("prepare:schema.ts", (data) => {
-    data.importItems.nitropack = {
-      import: [
-        { name: "NitroApp", type: true }
-      ],
-      from: "nitropack/types"
-    };
-    data.importItems.h3 = {
-      import: [
-        { name: "H3Event", type: true }
-      ],
-      from: "h3"
-    };
-    data.events.push({
-      key: "H3Event",
-      value: "H3Event",
-      extends: true,
-      isSilgiContext: false
-    });
-  });
-  silgi.hook("prepare:createDTSFramework", (data) => {
-    data.importItems["silgi/types"] = {
-      import: [
-        { name: "SilgiRuntimeContext", type: true }
-      ],
-      from: "silgi/types"
-    };
-    data.customContent?.push(
-      "",
-      'declare module "h3" {',
-      "  interface H3EventContext extends SilgiRuntimeContext {}",
-      "}",
-      ""
-    );
-  });
-  silgi.hook("prepare:core.ts", (data) => {
-    data._silgiConfigs.push(`captureError: (error, context = {}) => {
-        const promise = silgi.hooks
-          .callHookParallel('error', error, context)
-          .catch((error_) => {
-            console.error('Error while capturing another error', error_)
-          })
-  
-        if (context.event && isEvent(context.event)) {
-          const errors = context.event.context.nitro?.errors
-          if (errors) {
-            errors.push({ error, context })
-          }
-          if (context.event.waitUntil) {
-            context.event.waitUntil(promise)
-          }
-        }
-      }`);
-  });
-}
-
-async function nitroFramework(silgi, skip = false) {
-  if (silgi.options.preset !== "nitro" && skip === false)
-    return;
-  silgi.hook("prepare:schema.ts", (data) => {
-    data.importItems.nitropack = {
-      import: [
-        { name: "NitroApp", type: true }
-      ],
-      from: "nitropack/types"
-    };
-  });
-  silgi.hook("after:prepare:schema.ts", (data) => {
-    data.unshift("type FrameworkContextExtends = NitroApp");
-  });
-  silgi.options.plugins.push({
-    packageImport: "silgi/runtime/internal/nitro",
-    path: join(runtimeDir, "internal/nitro")
-  });
-  silgi.hook("prepare:core.ts", (_data) => {
-  });
-  await h3Framework(silgi, true);
-}
-
-async function nuxtFramework(silgi, skip = false) {
-  if (silgi.options.preset !== "nuxt" && skip === false)
-    return;
-  await nitroFramework(silgi, true);
-}
-
-const frameworkSetup = [emptyFramework, h3Framework, nitroFramework, nuxtFramework];
-
 async function prepare$1(_silgi) {
 }
 
@@ -873,6 +770,176 @@ async function writeTypesAndFiles(silgi) {
   await silgi.hooks.callHook("finish:types", readCore);
 }
 
+async function emptyFramework(silgi) {
+  if (silgi.options.preset === "npm-package" || !silgi.options.preset) {
+    silgi.hook("after:prepare:schema.ts", (data) => {
+      data.unshift("type FrameworkContextExtends = {}");
+    });
+  }
+}
+
+async function h3Framework(silgi, skip = false) {
+  if (silgi.options.preset !== "h3" && skip === false)
+    return;
+  if (silgi.options.preset === "h3") {
+    silgi.hook("after:prepare:schema.ts", (data) => {
+      data.unshift("type FrameworkContextExtends = NitroApp");
+    });
+  }
+  silgi.hook("prepare:schema.ts", (data) => {
+    data.importItems.nitropack = {
+      import: [
+        { name: "NitroApp", type: true }
+      ],
+      from: "nitropack/types"
+    };
+    data.importItems.h3 = {
+      import: [
+        { name: "H3Event", type: true }
+      ],
+      from: "h3"
+    };
+    data.events.push({
+      key: "H3Event",
+      value: "H3Event",
+      extends: true,
+      isSilgiContext: false
+    });
+  });
+  silgi.hook("prepare:createDTSFramework", (data) => {
+    data.importItems["silgi/types"] = {
+      import: [
+        { name: "SilgiRuntimeContext", type: true }
+      ],
+      from: "silgi/types"
+    };
+    data.customContent?.push(
+      "",
+      'declare module "h3" {',
+      "  interface H3EventContext extends SilgiRuntimeContext {}",
+      "}",
+      ""
+    );
+  });
+  silgi.hook("prepare:core.ts", (data) => {
+    data._silgiConfigs.push(`captureError: (error, context = {}) => {
+        const promise = silgi.hooks
+          .callHookParallel('error', error, context)
+          .catch((error_) => {
+            console.error('Error while capturing another error', error_)
+          })
+  
+        if (context.event && isEvent(context.event)) {
+          const errors = context.event.context.nitro?.errors
+          if (errors) {
+            errors.push({ error, context })
+          }
+          if (context.event.waitUntil) {
+            context.event.waitUntil(promise)
+          }
+        }
+      }`);
+  });
+  if (silgi.options.imports !== false) {
+    const h3Exports = await resolveModuleExportNames("h3", {
+      url: import.meta.url
+    });
+    silgi.options.imports.presets ??= [];
+    silgi.options.imports.presets.push({
+      from: "h3",
+      imports: h3Exports.filter((n) => !/^[A-Z]/.test(n) && n !== "use")
+    });
+  }
+}
+
+async function nitroFramework(silgi, skip = false) {
+  if (silgi.options.preset !== "nitro" && skip === false)
+    return;
+  silgi.hook("prepare:schema.ts", (data) => {
+    data.importItems.nitropack = {
+      import: [
+        { name: "NitroApp", type: true }
+      ],
+      from: "nitropack/types"
+    };
+  });
+  silgi.hook("after:prepare:schema.ts", (data) => {
+    data.unshift("type FrameworkContextExtends = NitroApp");
+  });
+  silgi.options.plugins.push({
+    packageImport: "silgi/runtime/internal/nitro",
+    path: join(runtimeDir, "internal/nitro")
+  });
+  silgi.hook("prepare:core.ts", (_data) => {
+    if (silgi.options.imports !== false) {
+      silgi.options.imports.presets ??= [];
+      silgi.options.imports.presets.push(...getNitroImportsPreset());
+    }
+  });
+  await h3Framework(silgi, true);
+}
+function getNitroImportsPreset() {
+  return [
+    {
+      from: "nitropack/runtime/internal/app",
+      imports: ["useNitroApp"]
+    },
+    {
+      from: "nitropack/runtime/internal/config",
+      imports: ["useRuntimeConfig", "useAppConfig"]
+    },
+    {
+      from: "nitropack/runtime/internal/plugin",
+      imports: ["defineNitroPlugin", "nitroPlugin"]
+    },
+    {
+      from: "nitropack/runtime/internal/cache",
+      imports: [
+        "defineCachedFunction",
+        "defineCachedEventHandler",
+        "cachedFunction",
+        "cachedEventHandler"
+      ]
+    },
+    {
+      from: "nitropack/runtime/internal/storage",
+      imports: ["useStorage"]
+    },
+    {
+      from: "nitropack/runtime/internal/renderer",
+      imports: ["defineRenderHandler"]
+    },
+    {
+      from: "nitropack/runtime/internal/meta",
+      imports: ["defineRouteMeta"]
+    },
+    {
+      from: "nitropack/runtime/internal/route-rules",
+      imports: ["getRouteRules"]
+    },
+    {
+      from: "nitropack/runtime/internal/context",
+      imports: ["useEvent"]
+    },
+    {
+      from: "nitropack/runtime/internal/task",
+      imports: ["defineTask", "runTask"]
+    },
+    {
+      from: "nitropack/runtime/internal/error/utils",
+      imports: ["defineNitroErrorHandler"]
+    }
+  ];
+}
+
+async function nuxtFramework(silgi, skip = false) {
+  if (silgi.options.preset !== "nuxt" && skip === false)
+    return;
+  await nitroFramework(silgi, true);
+}
+
+const frameworkSetup = [emptyFramework, h3Framework, nitroFramework, nuxtFramework];
+
 async function registerModuleExportScan(silgi) {
   silgi.hook("prepare:schema.ts", async (options) => {
     for (const module of silgi.scanModules) {
@@ -1777,6 +1844,9 @@ 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 scanFiles$1(silgi);
@@ -1828,9 +1898,6 @@ const prepare = defineCommand({
         preset: args.preset
       });
       await prepare$1();
-      for (const framework of frameworkSetup) {
-        await framework(silgi);
-      }
       await writeTypesAndFiles(silgi);
       await silgi.callHook("read:core.ts", async () => {
         const data = await readCoreFile(silgi);

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.9.0";
+const version = "0.9.2";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.3.0",
 	"@nuxt/kit": "^3.15.4",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.9.0";
+const version = "0.9.2";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.3.0",
 	"@nuxt/kit": "^3.15.4",

package/package.json

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