silgi 0.7.45 → 0.7.46

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.7.45";
+const version = "0.7.46";
 const packageJson = {
 	version: version};
 

package/dist/cli/prepare.mjs

@@ -600,48 +600,42 @@ async function silgiCoreFile(data, frameworkContext, silgi) {
       importItems[pkg.name].from = isAbsolute(id) ? relativeWithDot(relativeRootDir, id) : id;
     }
   }));
-  const customImports = data._customImports || [];
-  const uris = [];
-  const services = [];
-  const shareds = [];
-  const schemas = [];
-  const buildSilgiExtraContent = [];
-  const beforeBuildSilgiExtraContent = [];
-  const _silgiOptions = {};
-  const _silgiConfigs = [];
+  const _data = {
+    customImports: data._customImports || [],
+    uris: [],
+    services: [],
+    shareds: [],
+    schemas: [],
+    buildSilgiExtraContent: [],
+    beforeBuildSilgiExtraContent: [],
+    cliOptions: {},
+    afterCliOptions: [],
+    _silgiConfigs: [],
+    customContent: [],
+    importItems
+  };
   for (const module of silgi.scanModules) {
-    _silgiOptions[module.meta.configKey] = {
+    _data.cliOptions[module.meta.configKey] = {
       ...module.options
     };
   }
-  await silgi.callHook("prepare:core.ts", {
-    importItems,
-    customImports,
-    uris,
-    services,
-    shareds,
-    schemas,
-    buildSilgiExtraContent,
-    beforeBuildSilgiExtraContent,
-    _silgiOptions,
-    _silgiConfigs
-  });
+  await silgi.callHook("prepare:core.ts", _data);
   if (importItems["#silgi/vfs"].import.length === 0) {
     delete importItems["#silgi/vfs"];
   }
-  if (services.length > 0) {
+  if (_data.services.length > 0) {
     importItems["silgi/core"].import.push({ name: "mergeServices" });
   }
-  if (shareds.length > 0) {
+  if (_data.shareds.length > 0) {
     importItems["silgi/core"].import.push({ name: "mergeShared" });
   }
-  if (schemas.length > 0) {
+  if (_data.schemas.length > 0) {
     importItems["silgi/core"].import.push({ name: "mergeSchemas" });
   }
   const plugins = [];
   for (const plugin of silgi.options.plugins) {
     const pluginImportName = `_${hash(plugin.packageImport)}`;
-    customImports.push(`import ${pluginImportName} from '${plugin.packageImport}'`);
+    _data.customImports.push(`import ${pluginImportName} from '${plugin.packageImport}'`);
     plugins.push(pluginImportName);
   }
   const importsContent = [
@@ -649,38 +643,39 @@ async function silgiCoreFile(data, frameworkContext, silgi) {
       return `import { ${imports.map(({ type, name }) => type ? `type ${name}` : name).join(", ")} } from '${from}'`;
     }),
     "",
-    ...customImports,
+    ..._data.customImports,
     ""
   ];
   const importData = [
+    `export const cliOptions = ${JSON.stringify(_data.cliOptions, null, 2)}`,
+    "",
+    ..._data.afterCliOptions,
     "",
     "export const uris = {}",
     "",
     "export const modulesURIs = {}",
     "",
-    schemas.length > 0 ? "export const schemas = mergeSchemas([" : "export const schemas = {",
-    ...schemas.map((name) => {
+    _data.schemas.length > 0 ? "export const schemas = mergeSchemas([" : "export const schemas = {",
+    ..._data.schemas.map((name) => {
       return `  ${name},`;
     }),
-    schemas.length > 0 ? "])" : "}",
+    _data.schemas.length > 0 ? "])" : "}",
     "",
-    services.length > 0 ? "export const services = mergeServices([" : "export const services = {",
-    ...services.map((name) => {
+    _data.services.length > 0 ? "export const services = mergeServices([" : "export const services = {",
+    ..._data.services.map((name) => {
       return `  ${name},`;
     }),
-    services.length > 0 ? "])" : "}",
+    _data.services.length > 0 ? "])" : "}",
     "",
-    shareds.length > 0 ? "export const shareds = mergeShared([" : "export const shareds = {",
-    ...shareds.map((name) => {
+    _data.shareds.length > 0 ? "export const shareds = mergeShared([" : "export const shareds = {",
+    ..._data.shareds.map((name) => {
       return `  ${name},`;
     }),
-    shareds.length > 0 ? "])" : "}",
-    "",
-    `export const _silgiOptions = ${JSON.stringify(_silgiOptions, null, 2)}`,
+    _data.shareds.length > 0 ? "])" : "}",
     "",
     "export async function buildSilgi(framework: FrameworkContext, moduleOptions?: Partial<SilgiRuntimeOptions>,buildOptions?: Partial<BuildConfig>) {",
     "",
-    beforeBuildSilgiExtraContent.length > 0 ? beforeBuildSilgiExtraContent.map(({ value, type }) => {
+    _data.beforeBuildSilgiExtraContent.length > 0 ? _data.beforeBuildSilgiExtraContent.map(({ value, type }) => {
       return type === "function" ? value : `const ${value}`;
     }) : "",
     "",
@@ -692,20 +687,20 @@ async function silgiCoreFile(data, frameworkContext, silgi) {
     "      uris,",
     "      modulesURIs,",
     `      plugins: [${plugins.join(", ")}],`,
-    _silgiConfigs.length > 0 ? `      ${_silgiConfigs.map((config) => typeof config === "string" ? config : typeof config === "object" ? Object.entries(config).map(([key, value]) => `${key}: ${value}`).join(",\n      ") : "").join(",\n      ")},` : "",
+    _data._silgiConfigs.length > 0 ? `      ${_data._silgiConfigs.map((config) => typeof config === "string" ? config : typeof config === "object" ? Object.entries(config).map(([key, value]) => `${key}: ${value}`).join(",\n      ") : "").join(",\n      ")},` : "",
     "      ...buildOptions,",
     "      options: mergeDeep(",
     "        moduleOptions || {},",
     "        {",
     `          present: '${silgi.options.preset}',`,
-    "          ..._silgiOptions,",
+    "          ...cliOptions,",
     "        },",
     "      ) as any,",
     "    })",
     "",
     ...frameworkContext,
     "",
-    ...buildSilgiExtraContent,
+    ..._data.buildSilgiExtraContent,
     "",
     "  return silgi",
     "}",

package/dist/meta/index.d.mts

@@ -1,3 +1,3 @@
-const version = "0.7.45";
+const version = "0.7.46";
 
 export { version };

package/dist/meta/index.d.ts

@@ -1,3 +1,3 @@
-const version = "0.7.45";
+const version = "0.7.46";
 
 export { version };

package/dist/types/index.d.mts

@@ -223,6 +223,22 @@ interface SilgiHooks {
 interface GenerateAppOptions {
     filter?: (template: ResolvedSilgiTemplate<any>) => boolean;
 }
+interface PrepareCore extends ImportItem {
+    uris: string[];
+    services: string[];
+    shareds: string[];
+    schemas: string[];
+    buildSilgiExtraContent: string[];
+    beforeBuildSilgiExtraContent: {
+        value: string;
+        type: 'function' | 'variable';
+    }[];
+    cliOptions: {
+        [key: string]: any;
+    };
+    afterCliOptions: string[];
+    _silgiConfigs: any[];
+}
 interface SchemaPreparationOptions extends ImportItem {
     options: {
         key: string;
@@ -306,21 +322,7 @@ interface SilgiCLIHooks extends SilgiHooks {
         tsConfig: TSConfig;
     }) => HookResult;
     'finish:types': (data: CoreTs) => HookResult;
-    'prepare:core.ts': (options: {
-        uris: string[];
-        services: string[];
-        shareds: string[];
-        schemas: string[];
-        buildSilgiExtraContent: string[];
-        beforeBuildSilgiExtraContent: {
-            value: string;
-            type: 'function' | 'variable';
-        }[];
-        _silgiOptions: {
-            [key: string]: any;
-        };
-        _silgiConfigs: any[];
-    } & ImportItem) => HookResult;
+    'prepare:core.ts': (data: PrepareCore) => HookResult;
     'after:prepare:core.ts': (content: string[]) => HookResult;
     'prepare:schema.ts': (options: SchemaPreparationOptions) => HookResult;
     'after:prepare:schema.ts': (content: string[]) => HookResult;
@@ -948,4 +950,4 @@ type Namespaces<T extends BaseNamespaceType> = {
 
 declare const autoImportTypes: string[];
 
-export { type AppConfig, type Awaitable, type BaseNamespaceType, type BaseSchemaType, type BaseSilgiMethodType, type BuildConfig, type CaptureError, type CapturedErrorContext, type CoreTs, type CreateScope, type DeepPartial, type DefaultHooks, type DefaultNamespaces, type EventHandlerResponse, type ExtendContext, type ExtendShared, type ExtractInputFromURI, type ExtractOutputFromURI, type ExtractRouterParamsFromURI, type ExtractSourceFromURI, type FrameworkContext, type GenerateAppOptions, type GraphQLJSON, type HookResult, type ImportItem, type LoadConfigOptions, type MergedSilgiSchema, type MethodHandlerType, type ModuleDefinition, type ModuleHookContext, type ModuleMeta, type ModuleOptionsCustom, type ModuleSetupInstallResult, type ModuleSetupReturn, type Namespaces, type NitroBuildInfo, type RequiredServiceType, type ResolvedMethodHandlerType, type ResolvedModuleMeta, type ResolvedModuleOptions, type ResolvedServiceType, type ResolvedSilgiTemplate, type SchemaPreparationOptions, type ServiceType, type Silgi, type SilgiAppPlugin, type SilgiCLI, type SilgiCLIConfig, type SilgiCLIDynamicConfig, type SilgiCLIHooks, type SilgiCLIOptions, type SilgiCompatibility, type SilgiCompatibilityIssue, type SilgiCompatibilityIssues, type SilgiConfig, type SilgiEvents, type SilgiFrameworkInfo, type SilgiFunction, type SilgiHooks, type SilgiModule, type SilgiModuleInput, type SilgiModuleOptions, type SilgiNamespaces, type SilgiOperation, type SilgiOptions, type SilgiPreset, type SilgiPresetMeta, type SilgiRouterTypes, type SilgiRuntimeActions, type SilgiRuntimeContext, type SilgiRuntimeHooks, type SilgiRuntimeMethods, type SilgiRuntimeOptions, type SilgiRuntimeSharedExtends, type SilgiRuntimeShareds, type SilgiSchema, type SilgiServiceInterface, type SilgiStorageBase, type SilgiTemplate, type SilgiURIs, type StorageConfig, type StorageKeyGenerator, type StorageKeyParams, type StorageMounts, type TSReference, type URIsTypes, autoImportTypes };
+export { type AppConfig, type Awaitable, type BaseNamespaceType, type BaseSchemaType, type BaseSilgiMethodType, type BuildConfig, type CaptureError, type CapturedErrorContext, type CoreTs, type CreateScope, type DeepPartial, type DefaultHooks, type DefaultNamespaces, type EventHandlerResponse, type ExtendContext, type ExtendShared, type ExtractInputFromURI, type ExtractOutputFromURI, type ExtractRouterParamsFromURI, type ExtractSourceFromURI, type FrameworkContext, type GenerateAppOptions, type GraphQLJSON, type HookResult, type ImportItem, type LoadConfigOptions, type MergedSilgiSchema, type MethodHandlerType, type ModuleDefinition, type ModuleHookContext, type ModuleMeta, type ModuleOptionsCustom, type ModuleSetupInstallResult, type ModuleSetupReturn, type Namespaces, type NitroBuildInfo, type PrepareCore, type RequiredServiceType, type ResolvedMethodHandlerType, type ResolvedModuleMeta, type ResolvedModuleOptions, type ResolvedServiceType, type ResolvedSilgiTemplate, type SchemaPreparationOptions, type ServiceType, type Silgi, type SilgiAppPlugin, type SilgiCLI, type SilgiCLIConfig, type SilgiCLIDynamicConfig, type SilgiCLIHooks, type SilgiCLIOptions, type SilgiCompatibility, type SilgiCompatibilityIssue, type SilgiCompatibilityIssues, type SilgiConfig, type SilgiEvents, type SilgiFrameworkInfo, type SilgiFunction, type SilgiHooks, type SilgiModule, type SilgiModuleInput, type SilgiModuleOptions, type SilgiNamespaces, type SilgiOperation, type SilgiOptions, type SilgiPreset, type SilgiPresetMeta, type SilgiRouterTypes, type SilgiRuntimeActions, type SilgiRuntimeContext, type SilgiRuntimeHooks, type SilgiRuntimeMethods, type SilgiRuntimeOptions, type SilgiRuntimeSharedExtends, type SilgiRuntimeShareds, type SilgiSchema, type SilgiServiceInterface, type SilgiStorageBase, type SilgiTemplate, type SilgiURIs, type StorageConfig, type StorageKeyGenerator, type StorageKeyParams, type StorageMounts, type TSReference, type URIsTypes, autoImportTypes };

package/dist/types/index.d.ts

@@ -223,6 +223,22 @@ interface SilgiHooks {
 interface GenerateAppOptions {
     filter?: (template: ResolvedSilgiTemplate<any>) => boolean;
 }
+interface PrepareCore extends ImportItem {
+    uris: string[];
+    services: string[];
+    shareds: string[];
+    schemas: string[];
+    buildSilgiExtraContent: string[];
+    beforeBuildSilgiExtraContent: {
+        value: string;
+        type: 'function' | 'variable';
+    }[];
+    cliOptions: {
+        [key: string]: any;
+    };
+    afterCliOptions: string[];
+    _silgiConfigs: any[];
+}
 interface SchemaPreparationOptions extends ImportItem {
     options: {
         key: string;
@@ -306,21 +322,7 @@ interface SilgiCLIHooks extends SilgiHooks {
         tsConfig: TSConfig;
     }) => HookResult;
     'finish:types': (data: CoreTs) => HookResult;
-    'prepare:core.ts': (options: {
-        uris: string[];
-        services: string[];
-        shareds: string[];
-        schemas: string[];
-        buildSilgiExtraContent: string[];
-        beforeBuildSilgiExtraContent: {
-            value: string;
-            type: 'function' | 'variable';
-        }[];
-        _silgiOptions: {
-            [key: string]: any;
-        };
-        _silgiConfigs: any[];
-    } & ImportItem) => HookResult;
+    'prepare:core.ts': (data: PrepareCore) => HookResult;
     'after:prepare:core.ts': (content: string[]) => HookResult;
     'prepare:schema.ts': (options: SchemaPreparationOptions) => HookResult;
     'after:prepare:schema.ts': (content: string[]) => HookResult;
@@ -948,4 +950,4 @@ type Namespaces<T extends BaseNamespaceType> = {
 
 declare const autoImportTypes: string[];
 
-export { type AppConfig, type Awaitable, type BaseNamespaceType, type BaseSchemaType, type BaseSilgiMethodType, type BuildConfig, type CaptureError, type CapturedErrorContext, type CoreTs, type CreateScope, type DeepPartial, type DefaultHooks, type DefaultNamespaces, type EventHandlerResponse, type ExtendContext, type ExtendShared, type ExtractInputFromURI, type ExtractOutputFromURI, type ExtractRouterParamsFromURI, type ExtractSourceFromURI, type FrameworkContext, type GenerateAppOptions, type GraphQLJSON, type HookResult, type ImportItem, type LoadConfigOptions, type MergedSilgiSchema, type MethodHandlerType, type ModuleDefinition, type ModuleHookContext, type ModuleMeta, type ModuleOptionsCustom, type ModuleSetupInstallResult, type ModuleSetupReturn, type Namespaces, type NitroBuildInfo, type RequiredServiceType, type ResolvedMethodHandlerType, type ResolvedModuleMeta, type ResolvedModuleOptions, type ResolvedServiceType, type ResolvedSilgiTemplate, type SchemaPreparationOptions, type ServiceType, type Silgi, type SilgiAppPlugin, type SilgiCLI, type SilgiCLIConfig, type SilgiCLIDynamicConfig, type SilgiCLIHooks, type SilgiCLIOptions, type SilgiCompatibility, type SilgiCompatibilityIssue, type SilgiCompatibilityIssues, type SilgiConfig, type SilgiEvents, type SilgiFrameworkInfo, type SilgiFunction, type SilgiHooks, type SilgiModule, type SilgiModuleInput, type SilgiModuleOptions, type SilgiNamespaces, type SilgiOperation, type SilgiOptions, type SilgiPreset, type SilgiPresetMeta, type SilgiRouterTypes, type SilgiRuntimeActions, type SilgiRuntimeContext, type SilgiRuntimeHooks, type SilgiRuntimeMethods, type SilgiRuntimeOptions, type SilgiRuntimeSharedExtends, type SilgiRuntimeShareds, type SilgiSchema, type SilgiServiceInterface, type SilgiStorageBase, type SilgiTemplate, type SilgiURIs, type StorageConfig, type StorageKeyGenerator, type StorageKeyParams, type StorageMounts, type TSReference, type URIsTypes, autoImportTypes };
+export { type AppConfig, type Awaitable, type BaseNamespaceType, type BaseSchemaType, type BaseSilgiMethodType, type BuildConfig, type CaptureError, type CapturedErrorContext, type CoreTs, type CreateScope, type DeepPartial, type DefaultHooks, type DefaultNamespaces, type EventHandlerResponse, type ExtendContext, type ExtendShared, type ExtractInputFromURI, type ExtractOutputFromURI, type ExtractRouterParamsFromURI, type ExtractSourceFromURI, type FrameworkContext, type GenerateAppOptions, type GraphQLJSON, type HookResult, type ImportItem, type LoadConfigOptions, type MergedSilgiSchema, type MethodHandlerType, type ModuleDefinition, type ModuleHookContext, type ModuleMeta, type ModuleOptionsCustom, type ModuleSetupInstallResult, type ModuleSetupReturn, type Namespaces, type NitroBuildInfo, type PrepareCore, type RequiredServiceType, type ResolvedMethodHandlerType, type ResolvedModuleMeta, type ResolvedModuleOptions, type ResolvedServiceType, type ResolvedSilgiTemplate, type SchemaPreparationOptions, type ServiceType, type Silgi, type SilgiAppPlugin, type SilgiCLI, type SilgiCLIConfig, type SilgiCLIDynamicConfig, type SilgiCLIHooks, type SilgiCLIOptions, type SilgiCompatibility, type SilgiCompatibilityIssue, type SilgiCompatibilityIssues, type SilgiConfig, type SilgiEvents, type SilgiFrameworkInfo, type SilgiFunction, type SilgiHooks, type SilgiModule, type SilgiModuleInput, type SilgiModuleOptions, type SilgiNamespaces, type SilgiOperation, type SilgiOptions, type SilgiPreset, type SilgiPresetMeta, type SilgiRouterTypes, type SilgiRuntimeActions, type SilgiRuntimeContext, type SilgiRuntimeHooks, type SilgiRuntimeMethods, type SilgiRuntimeOptions, type SilgiRuntimeSharedExtends, type SilgiRuntimeShareds, type SilgiSchema, type SilgiServiceInterface, type SilgiStorageBase, type SilgiTemplate, type SilgiURIs, type StorageConfig, type StorageKeyGenerator, type StorageKeyParams, type StorageMounts, type TSReference, type URIsTypes, autoImportTypes };

package/package.json

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