silgi 0.29.15 → 0.29.17

package/dist/cli/index.mjs

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

package/dist/cli/install.mjs

@@ -1,16 +1,15 @@
 import { execSync } from 'node:child_process';
-import { readFileSync } from 'node:fs';
 import { defineCommand, runCommand } from 'citty';
 import { consola } from 'consola';
-import { resolve } from 'pathe';
 import { version } from 'silgi/meta';
 import { addNPMPackage, addTemplate } from 'silgi/kit';
 import { u as useSilgiCLI } from '../_chunks/silgiApp.mjs';
 import { c as commonArgs, p as prepare } from './prepare.mjs';
-import { l as loadOptions } from './types.mjs';
 import 'unctx';
+import 'pathe';
 import './silgi.mjs';
 import 'apiful/openapi';
+import 'node:fs';
 import 'node:fs/promises';
 import 'knitwork';
 import 'mlly';
@@ -18,17 +17,25 @@ import 'pathe/utils';
 import 'silgi/runtime/meta';
 import 'unimport';
 import 'untyped';
+import './types.mjs';
+import 'c12';
+import 'compatx';
+import 'klona/full';
+import 'std-env';
+import 'consola/utils';
+import 'escape-string-regexp';
+import 'pkg-types';
+import 'ufo';
+import 'defu';
 import 'hookable';
 import 'silgi';
 import '../_chunks/routeRules.mjs';
-import 'ufo';
 import '@clack/prompts';
 import 'dotenv';
 import 'dev-jiti';
 import './compatibility.mjs';
 import 'semver/functions/satisfies.js';
 import 'node:url';
-import 'defu';
 import 'exsolve';
 import 'globby';
 import 'ignore';
@@ -37,13 +44,6 @@ import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
 import 'scule';
-import 'c12';
-import 'compatx';
-import 'klona/full';
-import 'std-env';
-import 'consola/utils';
-import 'escape-string-regexp';
-import 'pkg-types';
 
 async function installPackages(silgi = useSilgiCLI()) {
   await addNPMPackage([
@@ -75,12 +75,15 @@ async function installPackages(silgi = useSilgiCLI()) {
     };
     packages.dependencies = {};
   }
-  addTemplate({
-    filename: "install.json",
-    where: ".silgi",
-    write: true,
-    getContents: () => JSON.stringify(packages, null, 2)
-  });
+  if (silgi.options.debug === true || silgi.options.debug.install) {
+    addTemplate({
+      filename: "install.json",
+      where: ".silgi",
+      write: true,
+      getContents: () => JSON.stringify(packages, null, 2)
+    });
+  }
+  return packages;
 }
 
 const install = defineCommand({
@@ -101,14 +104,10 @@ const install = defineCommand({
       rawArgs: ["--commandType", "install"]
     }).catch(() => {
     });
-    await installPackages();
-    const silgiConfig = await loadOptions({});
+    const packages = await installPackages();
     const commandArgs = process.argv.slice(process.argv.indexOf("install") + 1);
     const extraArgs = commandArgs.length ? ` ${commandArgs.join(" ")}` : "";
-    const getCli = resolve(silgiConfig.build.dir, "install.json");
-    const cli = readFileSync(getCli, "utf-8");
-    const cliJson = JSON.parse(cli);
-    if (Object.keys(cliJson).length === 0) {
+    if (Object.keys(packages).length === 0) {
       consola.info("Empty command list, maybe forgot pnpm silgi prepare?");
       return;
     }
@@ -116,8 +115,8 @@ const install = defineCommand({
       const cleanVersion = version.replace(/^[>=]+\s*/, "^");
       return `${name}@${cleanVersion}`;
     };
-    const deps = Object.entries(cliJson.dependencies || {}).map(([name, version]) => cleanPackageName(name, version)).join(" ");
-    const devDeps = Object.entries(cliJson.devDependencies || {}).map(([name, version]) => cleanPackageName(name, version)).join(" ");
+    const deps = Object.entries(packages.dependencies || {}).map(([name, version]) => cleanPackageName(name, version)).join(" ");
+    const devDeps = Object.entries(packages.devDependencies || {}).map(([name, version]) => cleanPackageName(name, version)).join(" ");
     if (deps) {
       consola.info("Installing dependencies...");
       execSync(`ni ${deps}${extraArgs}`, { stdio: "inherit" });

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, addImports, hash, toArray, writeFile, relativeWithDot, isDirectory, addCoreFile, resolveAlias as resolveAlias$1, directoryToURL, hasError, parseServices, resolveSilgiPath } from 'silgi/kit';
+import { hasSilgiModule, addTemplate, normalizeTemplate, useLogger, genEnsureSafeVar, baseHeaderBannerComment, 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';
@@ -230,6 +230,7 @@ async function prepareConfigs(silgi) {
       ]
     )
   )}`);
+  importData.unshift(...baseHeaderBannerComment);
   return importData;
 }
 
@@ -378,6 +379,7 @@ async function prepareCoreFile(silgi) {
   ];
   await silgi.callHook("after:core.ts", importData);
   importData.unshift(...importsContent);
+  importData.unshift(...baseHeaderBannerComment);
   return importData;
 }
 
@@ -1804,13 +1806,14 @@ async function scanExportFile(silgi) {
           if (type === "schema") {
             options.schemas.push(_name);
           }
-          options.importItems[path] ??= {
-            import: [],
-            from: relativeWithDot(silgi.options.silgi.serverDir, path)
-          };
-          options.importItems[path].import.push({
-            name: `${exportName} as ${_name}`,
-            key: _name
+          options.addImportItem({
+            specifier: relativeWithDot(silgi.options.silgi.serverDir, path),
+            imports: [
+              {
+                name: exportName,
+                as: _name
+              }
+            ]
           });
         }
       });
@@ -1949,36 +1952,39 @@ ${injectedResult.code}`;
 }
 
 async function prepareServerFiles(silgi) {
-  const importItems = {
-    "silgi": {
-      import: [
-        { name: "createSilgi", key: "createSilgi" },
-        { name: "createShared", key: "createShared" }
-      ],
-      from: "silgi"
-    },
-    "silgi/types": {
-      import: [
-        { name: "SilgiRuntimeOptions", type: true, key: "SilgiRuntimeOptions" },
-        { name: "FrameworkContext", type: true, key: "FrameworkContext" }
-      ],
-      from: "silgi/types"
-    },
-    "#silgi/vfs": {
-      import: [],
-      from: "./vfs"
-    },
-    "configs.ts": {
-      import: [
-        {
-          name: "cliConfigs",
-          type: false,
-          key: "cliConfigs"
-        }
-      ],
-      from: "./configs.ts"
-    }
-  };
+  const { genImports, genTypeImports, addImportItem, addImportItemType } = addImports({
+    imports: [
+      {
+        specifier: "silgi",
+        imports: [
+          {
+            name: "createSilgi"
+          }
+        ]
+      },
+      {
+        specifier: "./configs",
+        imports: [
+          {
+            name: "cliConfigs"
+          }
+        ]
+      }
+    ],
+    typeImports: [
+      {
+        specifier: "silgi/types",
+        imports: [
+          {
+            name: "SilgiRuntimeOptions"
+          },
+          {
+            name: "FrameworkContext"
+          }
+        ]
+      }
+    ]
+  });
   const scanned = {
     uris: {},
     services: [],
@@ -1989,8 +1995,8 @@ async function prepareServerFiles(silgi) {
     ],
     schemas: [],
     modulesURIs: {},
-    customImports: [],
-    importItems
+    addImportItem,
+    addImportItemType
   };
   if (silgi.uris) {
     defu(scanned.uris, silgi.uris);
@@ -1999,30 +2005,37 @@ async function prepareServerFiles(silgi) {
     defu(scanned.modulesURIs, silgi.modulesURIs);
   }
   await silgi.callHook("prepare:scan.ts", scanned);
-  if (importItems["#silgi/vfs"].import.length === 0) {
-    delete importItems["#silgi/vfs"];
-  }
   if (scanned.services.length > 0) {
-    importItems.silgi.import.push({ name: "mergeServices", key: "mergeServices" });
+    addImportItem({
+      specifier: "silgi",
+      imports: {
+        name: "mergeServices"
+      }
+    });
   }
   if (scanned.shareds.length > 0) {
-    importItems.silgi.import.push({ name: "mergeShared", key: "mergeShared" });
+    addImportItem({
+      specifier: "silgi",
+      imports: {
+        name: "mergeShared"
+      }
+    });
   }
   if (scanned.schemas.length > 0) {
-    importItems.silgi.import.push({ name: "mergeSchemas", key: "mergeSchemas" });
-  }
-  for (const key in importItems) {
-    importItems[key].import = deduplicateImportsByKey(importItems[key].import);
+    addImportItem({
+      specifier: "silgi",
+      imports: {
+        name: "mergeSchemas"
+      }
+    });
   }
   const importsContent = [
-    ...Object.entries(importItems).map(([_name, { from, import: imports }]) => {
-      if (silgi.options.typescript.removeFileExtension) {
-        from = from.replace(/\.(js|ts|mjs|cjs|jsx|tsx)$/, "");
-      }
-      return `import { ${imports.map(({ type, name }) => type ? `type ${name}` : name).join(", ")} } from '${from}'`;
+    ...genImports.map(({ specifier, imports, options }) => {
+      return genImport(specifier, imports, options);
+    }),
+    ...genTypeImports.map(({ specifier, imports }) => {
+      return genTypeImport(specifier, Array.isArray(imports) ? imports : [imports]);
     }),
-    "",
-    ...scanned.customImports,
     ""
   ];
   const importData = [
@@ -2051,18 +2064,9 @@ async function prepareServerFiles(silgi) {
   ];
   await silgi.callHook("after:prepare:scan.ts", importData);
   importData.unshift(...importsContent);
+  importData.unshift(...baseHeaderBannerComment);
   return importData;
 }
-function deduplicateImportsByKey(imports) {
-  const seenKeys = /* @__PURE__ */ new Map();
-  return imports.filter((item) => {
-    if (seenKeys.has(item.key)) {
-      return false;
-    }
-    seenKeys.set(item.key, true);
-    return true;
-  });
-}
 
 async function writeScanFiles(silgi) {
   const data = await prepareServerFiles(silgi);

package/dist/kit/index.d.mts

@@ -12,7 +12,7 @@ declare function addCoreFile(data: {
     after?: SilgiCLIHooks['after:core.ts'];
 }): Promise<void>;
 
-declare function addImports(data: {
+declare function addImports(data?: {
     imports?: GenImport[];
     typeImports?: GenImport[];
 }): {

package/dist/kit/index.mjs

@@ -81,10 +81,10 @@ async function addCoreFile(data) {
 
 function addImports(data) {
   const genImports = [
-    ...data.imports ?? []
+    ...data?.imports ?? []
   ];
   const genTypeImports = [
-    ...data.typeImports ?? []
+    ...data?.typeImports ?? []
   ];
   function addImportItem(data2) {
     for (const item of toArray$1(data2)) {

package/dist/types/index.d.mts

@@ -203,14 +203,29 @@ interface SilgiCLIHooks extends SilgiHooks {
         declarations: string[];
         tsConfig: TSConfig;
     }) => HookResult;
-    'before:core.ts': (data: PrepareCore) => HookResult;
+    'before:core.ts': (data: {
+        silgiConfigs: Record<string, any>[];
+        addImportItem: (data: GenImport | GenImport[]) => void;
+        addImportItemType: (data: GenImport | GenImport[]) => void;
+        addBuildFunction: (data: {
+            name: string;
+            params?: string[];
+            where: 'before' | 'after';
+        }[] | {
+            name: string;
+            params?: string[];
+            where: 'before' | 'after';
+        }) => void;
+    }) => HookResult;
     'after:core.ts': (content: string[]) => HookResult;
-    'prepare:scan.ts': (data: Pick<ImportItem, 'customImports' | 'importItems'> & {
+    'prepare:scan.ts': (data: {
         uris: Record<string, string>;
         services: string[];
         shareds: string[];
         schemas: string[];
         modulesURIs: Record<string, string>;
+        addImportItem: (data: GenImport | GenImport[]) => void;
+        addImportItemType: (data: GenImport | GenImport[]) => void;
     }) => HookResult;
     'after:prepare:scan.ts': (content: string[]) => HookResult;
     'prepare:schema.ts': (options: {
@@ -293,20 +308,6 @@ interface SilgiHooks {
 interface GenerateAppOptions {
     filter?: (template: ResolvedSilgiTemplate<any>) => boolean;
 }
-interface PrepareCore {
-    silgiConfigs: Record<string, any>[];
-    addImportItem: (data: GenImport | GenImport[]) => void;
-    addImportItemType: (data: GenImport | GenImport[]) => void;
-    addBuildFunction: (data: {
-        name: string;
-        params?: string[];
-        where: 'before' | 'after';
-    }[] | {
-        name: string;
-        params?: string[];
-        where: 'before' | 'after';
-    }) => void;
-}
 
 /**
  * Bu nitrojs, h3 event or request context.
@@ -621,6 +622,7 @@ interface SilgiCLIOptions extends PresetOptions {
     isPreparingModules: boolean;
     debug: true | {
         command?: boolean;
+        install?: boolean;
     };
     preset: PresetName;
     static: boolean;
@@ -1194,4 +1196,4 @@ interface ServiceParseModule {
     (params: ServiceParse): Awaited<void> | void;
 }
 
-export type { AllPaths, AppConfig, Awaitable, BaseNamespaceType, BaseSchemaType, BaseSilgiMethodType, BuildSilgi, CaptureError, CapturedErrorContext, CommandType, Commands, CreateScope, DeepPartial, DeepRequired, DefaultHooks, DefaultNamespaces, DefaultRouteConfig, DefaultRouteRules, DotenvOptions, EnvOptions, EventHandlerResponse, ExtendContext, ExtendShared, ExtractInputFromURI, ExtractOutputFromURI, ExtractPathParams, ExtractPathParamsFromURI, ExtractQueryParamsFromURI, ExtractSourceFromURI, FrameworkContext, GenImport, GenerateAppOptions, GraphQLJSON, HookResult, HttpMethod, ImportItem, LoadConfigOptions, MergedSilgiSchema, MethodHandlerType, ModuleDefinition, ModuleHookContext, ModuleMeta, ModuleOptionsCustom, ModuleSetupInstallResult, ModuleSetupReturn, Namespaces, NitroBuildInfo, PrepareCore, RequiredServiceType, ResolvedMethodHandlerType, ResolvedModuleMeta, ResolvedModuleOptions, ResolvedServiceType, ResolvedSilgiTemplate, RouteRules, RouterParams, ScanFile, ServiceParse, ServiceParseModule, ServiceType, Silgi, SilgiAppPlugin, SilgiCLI, SilgiCLIConfig, SilgiCLIDynamicConfig, SilgiCLIHooks, SilgiCLIOptions, SilgiCommands, SilgiCompatibility, SilgiCompatibilityIssue, SilgiCompatibilityIssues, SilgiConfig, SilgiEvents, SilgiFetchClient, SilgiFetchOptions, SilgiFrameworkInfo, SilgiFunction, SilgiHooks, SilgiModule, SilgiModuleInput, SilgiModuleOptions, SilgiNamespaces, SilgiOperation, SilgiOptions, SilgiPreset, SilgiPresetMeta, SilgiRouteRules, SilgiRouterTypes, SilgiRuntimeActions, SilgiRuntimeConfig, SilgiRuntimeContext, SilgiRuntimeHooks, SilgiRuntimeMethods, SilgiRuntimeOptions, SilgiRuntimeRouteRules, SilgiRuntimeRouteRulesConfig, SilgiRuntimeShareds, SilgiRuntimeSharedsExtend, SilgiSchema, SilgiServiceInterface, SilgiStorageBase, SilgiTemplate, SilgiURIs, StorageConfig, StorageKeyGenerator, StorageKeyParams, StorageMounts, TSReference, TrimAfterFourSlashes, URIsTypes };
+export type { AllPaths, AppConfig, Awaitable, BaseNamespaceType, BaseSchemaType, BaseSilgiMethodType, BuildSilgi, CaptureError, CapturedErrorContext, CommandType, Commands, CreateScope, DeepPartial, DeepRequired, DefaultHooks, DefaultNamespaces, DefaultRouteConfig, DefaultRouteRules, DotenvOptions, EnvOptions, EventHandlerResponse, ExtendContext, ExtendShared, ExtractInputFromURI, ExtractOutputFromURI, ExtractPathParams, ExtractPathParamsFromURI, ExtractQueryParamsFromURI, ExtractSourceFromURI, FrameworkContext, GenImport, GenerateAppOptions, GraphQLJSON, HookResult, HttpMethod, ImportItem, LoadConfigOptions, MergedSilgiSchema, MethodHandlerType, ModuleDefinition, ModuleHookContext, ModuleMeta, ModuleOptionsCustom, ModuleSetupInstallResult, ModuleSetupReturn, Namespaces, NitroBuildInfo, RequiredServiceType, ResolvedMethodHandlerType, ResolvedModuleMeta, ResolvedModuleOptions, ResolvedServiceType, ResolvedSilgiTemplate, RouteRules, RouterParams, ScanFile, ServiceParse, ServiceParseModule, ServiceType, Silgi, SilgiAppPlugin, SilgiCLI, SilgiCLIConfig, SilgiCLIDynamicConfig, SilgiCLIHooks, SilgiCLIOptions, SilgiCommands, SilgiCompatibility, SilgiCompatibilityIssue, SilgiCompatibilityIssues, SilgiConfig, SilgiEvents, SilgiFetchClient, SilgiFetchOptions, SilgiFrameworkInfo, SilgiFunction, SilgiHooks, SilgiModule, SilgiModuleInput, SilgiModuleOptions, SilgiNamespaces, SilgiOperation, SilgiOptions, SilgiPreset, SilgiPresetMeta, SilgiRouteRules, SilgiRouterTypes, SilgiRuntimeActions, SilgiRuntimeConfig, SilgiRuntimeContext, SilgiRuntimeHooks, SilgiRuntimeMethods, SilgiRuntimeOptions, SilgiRuntimeRouteRules, SilgiRuntimeRouteRulesConfig, SilgiRuntimeShareds, SilgiRuntimeSharedsExtend, SilgiSchema, SilgiServiceInterface, SilgiStorageBase, SilgiTemplate, SilgiURIs, StorageConfig, StorageKeyGenerator, StorageKeyParams, StorageMounts, TSReference, TrimAfterFourSlashes, URIsTypes };

package/package.json

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