silgi 0.29.13 → 0.29.15

package/dist/cli/index.mjs

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

package/dist/cli/silgi.mjs

@@ -1,7 +1,7 @@
 import { generateDTS } from 'apiful/openapi';
 import consola$1, { consola } from 'consola';
 import { join, resolve, dirname, isAbsolute, relative, basename, extname } from 'pathe';
-import { hasSilgiModule, addTemplate, normalizeTemplate, useLogger, genEnsureSafeVar, toArray, hash, writeFile, relativeWithDot, isDirectory, resolveAlias as resolveAlias$1, directoryToURL, hasError, parseServices, resolveSilgiPath } from 'silgi/kit';
+import { hasSilgiModule, addTemplate, normalizeTemplate, useLogger, genEnsureSafeVar, addImports, hash, toArray, writeFile, relativeWithDot, isDirectory, addCoreFile, resolveAlias as resolveAlias$1, directoryToURL, hasError, parseServices, resolveSilgiPath } from 'silgi/kit';
 import { mkdirSync, existsSync, writeFileSync, promises, readFileSync } from 'node:fs';
 import { readdir, readFile } from 'node:fs/promises';
 import { genObjectFromRawEntries, genImport, genTypeImport, genObjectFromRaw, genObjectFromValues } from 'knitwork';
@@ -233,63 +233,8 @@ async function prepareConfigs(silgi) {
   return importData;
 }
 
-function scanImports(data) {
-  const genImports = [
-    ...data.imports ?? []
-  ];
-  const genTypeImports = [
-    ...data.typeImports ?? []
-  ];
-  function addImportItem(data2) {
-    for (const item of toArray(data2)) {
-      const isSpecifier = genImports.some((i) => i.specifier === item.specifier);
-      if (isSpecifier) {
-        const index = genImports.findIndex((i) => i.specifier === item.specifier);
-        if (Array.isArray(genImports[index].imports)) {
-          genImports[index].imports ??= [];
-          genImports[index].imports.push(...toArray(item.imports));
-        } else {
-          genImports[index].imports = item.imports;
-        }
-      } else {
-        genImports.push({
-          specifier: item.specifier,
-          imports: item.imports,
-          options: item.options
-        });
-      }
-    }
-  }
-  function addImportItemType(data2) {
-    for (const item of toArray(data2)) {
-      const isSpecifier = genTypeImports.some((i) => i.specifier === item.specifier);
-      if (isSpecifier) {
-        const index = genTypeImports.findIndex((i) => i.specifier === item.specifier);
-        if (Array.isArray(genTypeImports[index].imports)) {
-          genTypeImports[index].imports ??= [];
-          genTypeImports[index].imports.push(...toArray(item.imports));
-        } else {
-          genTypeImports[index].imports = item.imports;
-        }
-      } else {
-        genTypeImports.push({
-          specifier: item.specifier,
-          imports: item.imports,
-          options: item.options
-        });
-      }
-    }
-  }
-  return {
-    genImports,
-    genTypeImports,
-    addImportItem,
-    addImportItemType
-  };
-}
-
 async function prepareCoreFile(silgi) {
-  const { genImports, genTypeImports, addImportItem, addImportItemType } = scanImports({
+  const { genImports, genTypeImports, addImportItem, addImportItemType } = addImports({
     imports: [
       {
         specifier: "silgi/runtime",
@@ -1063,26 +1008,28 @@ async function h3Framework(silgi, skip = false) {
       ""
     );
   });
-  silgi.hook("before:core.ts", (data) => {
-    data.createSilgiParams.push({
-      captureError: `(silgi, error, context = {}) => {
-        const promise = silgi.hooks
-          .callHookParallel('error', silgi, 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)
+  addCoreFile({
+    before: ({ silgiConfigs }) => {
+      silgiConfigs.push({
+        captureError: `(silgi, error, context = {}) => {
+          const promise = silgi.hooks
+            .callHookParallel('error', silgi, 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", {

package/dist/kit/index.d.mts

@@ -1,4 +1,4 @@
-import { Commands, SilgiCLIHooks, SilgiCLI, ModuleOptionsCustom, ModuleDefinition, SilgiModule, ServiceParseModule, SilgiPreset, SilgiPresetMeta, SilgiTemplate, ResolvedSilgiTemplate, SilgiEvents } from 'silgi/types';
+import { Commands, SilgiCLIHooks, GenImport, SilgiCLI, ModuleOptionsCustom, ModuleDefinition, SilgiModule, ServiceParseModule, SilgiPreset, SilgiPresetMeta, SilgiTemplate, ResolvedSilgiTemplate, SilgiEvents } from 'silgi/types';
 import { Buffer } from 'node:buffer';
 import { ConsolaOptions, ConsolaInstance } from 'consola';
 import * as rfc6902 from 'rfc6902';
@@ -12,6 +12,16 @@ declare function addCoreFile(data: {
     after?: SilgiCLIHooks['after:core.ts'];
 }): Promise<void>;
 
+declare function addImports(data: {
+    imports?: GenImport[];
+    typeImports?: GenImport[];
+}): {
+    genImports: GenImport[];
+    genTypeImports: GenImport[];
+    addImportItem: (data: GenImport | GenImport[]) => void;
+    addImportItemType: (data: GenImport | GenImport[]) => void;
+};
+
 declare function addNPMPackage(data: {
     name: string;
     version?: string;
@@ -303,5 +313,5 @@ declare const baseHeaderBannerComment: string[];
 declare function processFilePath(src: string): string;
 declare function isPresents(names: PresetName[]): boolean;
 
-export { MODE_RE, MigrationStatus, addCommands, addCoreFile, addNPMPackage, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, generateMigration, getAllEntries, getIpAddress, getMigration, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory, isH3, isNitro, isNuxt, isPresents, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
+export { MODE_RE, MigrationStatus, addCommands, addCoreFile, addImports, addNPMPackage, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, generateMigration, getAllEntries, getIpAddress, getMigration, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory, isH3, isNitro, isNuxt, isPresents, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
 export type { FunctionConfig, JsonPatch, MigrationData, MigrationInfo, MigrationOptions, MigrationResult };

package/dist/kit/index.mjs

@@ -1,6 +1,7 @@
 import { u as useSilgiCLI$1 } from '../_chunks/silgiApp.mjs';
 import { relative, resolve, dirname, join, normalize, isAbsolute, parse, basename } from 'pathe';
 import { useSilgiCLI, tryUseSilgiCLI, useSilgi } from 'silgi';
+import { toArray as toArray$1, hash as hash$2 } from 'silgi/kit';
 import { execSync } from 'node:child_process';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import { resolvePath as resolvePath$1 } from 'mlly';
@@ -17,7 +18,6 @@ import { defu } from 'defu';
 import { c as checkSilgiCompatibility } from '../cli/compatibility.mjs';
 import { withLeadingSlash } from 'ufo';
 import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
-import { hash as hash$2 } from 'silgi/kit';
 import 'unctx';
 import 'semver/functions/satisfies.js';
 import 'silgi/meta';
@@ -79,6 +79,61 @@ async function addCoreFile(data) {
     silgi.hook("after:core.ts", data.after);
 }
 
+function addImports(data) {
+  const genImports = [
+    ...data.imports ?? []
+  ];
+  const genTypeImports = [
+    ...data.typeImports ?? []
+  ];
+  function addImportItem(data2) {
+    for (const item of toArray$1(data2)) {
+      const isSpecifier = genImports.some((i) => i.specifier === item.specifier);
+      if (isSpecifier) {
+        const index = genImports.findIndex((i) => i.specifier === item.specifier);
+        if (Array.isArray(genImports[index].imports)) {
+          genImports[index].imports ??= [];
+          genImports[index].imports.push(...toArray$1(item.imports));
+        } else {
+          genImports[index].imports = item.imports;
+        }
+      } else {
+        genImports.push({
+          specifier: item.specifier,
+          imports: item.imports,
+          options: item.options
+        });
+      }
+    }
+  }
+  function addImportItemType(data2) {
+    for (const item of toArray$1(data2)) {
+      const isSpecifier = genTypeImports.some((i) => i.specifier === item.specifier);
+      if (isSpecifier) {
+        const index = genTypeImports.findIndex((i) => i.specifier === item.specifier);
+        if (Array.isArray(genTypeImports[index].imports)) {
+          genTypeImports[index].imports ??= [];
+          genTypeImports[index].imports.push(...toArray$1(item.imports));
+        } else {
+          genTypeImports[index].imports = item.imports;
+        }
+      } else {
+        genTypeImports.push({
+          specifier: item.specifier,
+          imports: item.imports,
+          options: item.options
+        });
+      }
+    }
+  }
+  return {
+    genImports,
+    genTypeImports,
+    addImportItem,
+    addImportItemType
+  };
+}
+
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 async function addNPMPackage(data) {
   const silgi = useSilgiCLI$1();
@@ -973,4 +1028,4 @@ function isValidIp(ip) {
   return false;
 }
 
-export { MODE_RE, MigrationStatus, addCommands, addCoreFile, addNPMPackage, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, generateMigration, getAllEntries, getIpAddress, getMigration, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, isPresents, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
+export { MODE_RE, MigrationStatus, addCommands, addCoreFile, addImports, addNPMPackage, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, generateMigration, getAllEntries, getIpAddress, getMigration, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, isPresents, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };

package/package.json

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