silgi 0.7.22 → 0.7.24

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.7.22";
+const version = "0.7.24";
 const packageJson = {
 	version: version};
 

package/dist/cli/prepare.mjs

@@ -305,21 +305,21 @@ function scanActionModulesUris(silgi, obj, currentPath = []) {
     if (path.length === 4) {
       const basePath = path.join("/");
       let moduleName = "";
-      if (node.modules?.yoga) {
-        let rootFieldName = null;
-        if (node.modules?.yoga?.rootFieldName) {
-          moduleName = "yoga";
-          rootFieldName = node.modules?.yoga?.rootFieldName;
+      if (node.modules?.graphql) {
+        let field = null;
+        if (node.modules?.graphql?.field) {
+          moduleName = "graphql";
+          field = node.modules?.graphql?.field;
         }
-        if (!rootFieldName) {
+        if (!field) {
           return;
         }
         uriMap[moduleName] ??= {};
-        if (uriMap[moduleName].rootFieldName) {
-          silgi.logger.withTag("scanActionModulesUris").error(`Hata ${moduleName} ${rootFieldName} ${basePath} bu zaten burada kullanilmis.`);
+        if (typeof uriMap[moduleName].field === "object" && uriMap[moduleName].field[field]) {
+          silgi.logger.withTag("scanActionModulesUris").error(`Hata ${moduleName} ${field} ${basePath} bu zaten burada kullanilmis.`);
         }
-        uriMap[moduleName].rootFieldName ??= {};
-        uriMap[moduleName].rootFieldName[rootFieldName] = basePath;
+        uriMap[moduleName].field ??= {};
+        uriMap[moduleName].field[field] = basePath;
       }
       return;
     }
@@ -576,6 +576,14 @@ async function silgiCoreFile(data, frameworkContext, silgi) {
     "#silgi/vfs": {
       import: [],
       from: "./vfs"
+    },
+    "@fastify/deepmerge": {
+      import: [
+        {
+          name: "deepmerge"
+        }
+      ],
+      from: "@fastify/deepmerge"
     }
   };
   importItems = { ...data._importItems, ...importItems };
@@ -642,6 +650,9 @@ async function silgiCoreFile(data, frameworkContext, silgi) {
     ""
   ];
   const importData = [
+    "",
+    "const mergeDeep = deepmerge({ all: true })",
+    "",
     "export const uris = {}",
     "",
     "export const modulesURIs = {}",
@@ -666,7 +677,8 @@ async function silgiCoreFile(data, frameworkContext, silgi) {
     "",
     `export const _silgiOptions: DeepPartial<SilgiRuntimeOptions> = ${JSON.stringify(_silgiOptions, null, 2)}`,
     "",
-    "export async function buildSilgi(framework: FrameworkContext, moduleOptions?: Partial<SilgiRuntimeOptions>,buildOptions?: Partial<BuildConfig>, ) {",
+    "export async function buildSilgi(framework: FrameworkContext, moduleOptions?: Partial<SilgiRuntimeOptions>,buildOptions?: Partial<BuildConfig>) {",
+    "",
     "  const silgi = await createSilgi({",
     "      framework,",
     "      shared: shareds as any,",
@@ -677,11 +689,11 @@ async function silgiCoreFile(data, frameworkContext, silgi) {
     `      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      ")},` : "",
     "      ...buildOptions,",
-    "      options: {",
+    "      options: mergeDeep({",
     `      present: '${silgi.options.preset}',`,
-    "      ..._silgiOptions,",
     "      ...moduleOptions,",
-    "     },",
+    "      ..._silgiOptions",
+    "     }),",
     "    })",
     "",
     ...frameworkContext,

package/dist/meta/index.d.mts

@@ -1,3 +1,3 @@
-const version = "0.7.22";
+const version = "0.7.24";
 
 export { version };

package/dist/meta/index.d.ts

@@ -1,3 +1,3 @@
-const version = "0.7.22";
+const version = "0.7.24";
 
 export { version };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.7.22",
+  "version": "0.7.24",
   "private": false,
   "sideEffects": false,
   "exports": {
@@ -109,6 +109,7 @@
     }
   },
   "dependencies": {
+    "@fastify/deepmerge": "^2.0.2",
     "@oxc-parser/wasm": "^0.49.0",
     "@standard-schema/spec": "^1.0.0",
     "c12": "^2.0.1",