silgi 0.20.29 → 0.20.31

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.20.29";
+const version = "0.20.31";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/cli/common.mjs

@@ -923,10 +923,6 @@ async function prepareServerFiles(silgi) {
     defu$1(scanned.modulesURIs, silgi.modulesURIs);
   }
   await silgi.callHook("prepare:scan.ts", scanned);
-  scanned.services = [...new Set(scanned.services)];
-  scanned.shareds = [...new Set(scanned.shareds)];
-  scanned.schemas = [...new Set(scanned.schemas)];
-  scanned.customImports = [...new Set(scanned.customImports)];
   if (importItems["#silgi/vfs"].import.length === 0) {
     delete importItems["#silgi/vfs"];
   }
@@ -1243,136 +1239,109 @@ async function scanFiles$1(silgi, watchFiles) {
       if (hasError("Parser", silgi)) {
         return;
       }
+      const scanTS = [];
+      const schemaTS = [];
       if (createServices.length > 0) {
-        for (const createService of createServices) {
-          const { exportName, path } = createService;
+        scanTS.push(...createServices.map(({ exportName, path }) => {
           silgi.options.devServer.watch.push(path);
           const randomString = hash(basename(path) + exportName);
           const _name = `_v${randomString}`;
-          silgi.hook("prepare:scan.ts", (options) => {
-            options.services.push(_name);
-          });
-          silgi.hook("prepare:scan.ts", (options) => {
-            options.importItems[path] ??= {
-              import: [],
-              from: relativeWithDot(silgi.options.silgi.serverDir, path)
-            };
-            options.importItems[path].import.push({
-              name: `${exportName} as ${_name}`,
-              key: _name
-            });
-          });
-        }
+          return { exportName, path, _name, type: "service" };
+        }));
       }
       const createSchemas = exportVariables("createSchema", filePath);
       if (hasError("Parser", silgi)) {
         return;
       }
       if (createSchemas.length > 0) {
-        for (const createSchema of createSchemas) {
-          const { exportName, path } = createSchema;
+        scanTS.push(...createSchemas.map(({ exportName, path }) => {
           silgi.options.devServer.watch.push(path);
           const randomString = hash(basename(path) + exportName);
           const _name = `_v${randomString}`;
-          silgi.hook("prepare:scan.ts", (options) => {
-            options.schemas.push(_name);
-          });
-          silgi.hook("prepare:scan.ts", (options) => {
-            options.importItems[path] ??= {
-              import: [],
-              from: relativeWithDot(silgi.options.silgi.serverDir, path)
-            };
-            options.importItems[path].import.push({
-              name: `${exportName} as ${_name}`,
-              key: _name
-            });
-          });
-        }
+          return { exportName, path, _name, type: "schema" };
+        }));
       }
       const createShareds = exportVariables("createShared", filePath);
       if (hasError("Parser", silgi)) {
         return;
       }
       if (createShareds.length > 0) {
-        for (const createShared of createShareds) {
-          const { exportName, path } = createShared;
+        scanTS.push(...createShareds.map(({ exportName, path }) => {
           silgi.options.devServer.watch.push(path);
           const randomString = hash(basename(path) + exportName);
           const _name = `_v${randomString}`;
-          silgi.hook("prepare:scan.ts", (options) => {
-            options.shareds.push(_name);
-          });
-          silgi.hook("prepare:scan.ts", (options) => {
-            options.importItems[path] ??= {
-              import: [],
-              // Relative path kaldirmamiz gerekiyor bunlar hooklarin bittigi yerde karar verilmeli.
-              from: relativeWithDot(silgi.options.silgi.serverDir, path)
-            };
-            options.importItems[path].import.push({
-              name: `${exportName} as ${_name}`,
-              key: _name
-            });
-          });
-        }
+          return { exportName, path, _name, type: "shared" };
+        }));
       }
       const sharedsTypes = parseInterfaceDeclarations("ExtendShared", filePath);
       if (hasError("Parser", silgi)) {
         return;
       }
       if (sharedsTypes.length > 0) {
-        for (const sharedType of sharedsTypes) {
-          const { exportName, path } = sharedType;
+        schemaTS.push(...sharedsTypes.map(({ exportName, path }) => {
           silgi.options.devServer.watch.push(path);
           const randomString = hash(basename(path) + exportName);
           const _name = `_v${randomString}`;
-          silgi.hook("prepare:schema.ts", (options) => {
-            options.shareds.push({
-              key: _name,
-              value: _name
-            });
-          });
-          silgi.hook("prepare:schema.ts", (options) => {
-            options.importItems[path] ??= {
-              import: [],
-              from: path
-            };
-            options.importItems[path].import.push({
-              name: `${exportName} as ${_name}`,
-              type: true,
-              key: _name
-            });
-          });
-        }
+          return { exportName, path, _name, type: "shared" };
+        }));
       }
       const contextTypes = parseInterfaceDeclarations("ExtendContext", filePath);
       if (hasError("Parser", silgi)) {
         return;
       }
       if (contextTypes.length > 0) {
-        for (const contextType of contextTypes) {
-          const { exportName, path } = contextType;
+        schemaTS.push(...contextTypes.map(({ exportName, path }) => {
           silgi.options.devServer.watch.push(path);
           const randomString = hash(basename(path) + exportName);
           const _name = `_v${randomString}`;
-          silgi.hook("prepare:schema.ts", (options) => {
-            options.contexts.push({
+          return { exportName, path, _name, type: "context" };
+        }));
+      }
+      silgi.hook("prepare:scan.ts", (options) => {
+        for (const { exportName, path, _name, type } of scanTS) {
+          if (type === "service") {
+            options.services.push(_name);
+          }
+          if (type === "shared") {
+            options.shareds.push(_name);
+          }
+          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
+          });
+        }
+      });
+      silgi.hook("prepare:schema.ts", (options) => {
+        for (const { exportName, path, _name, type } of schemaTS) {
+          if (type === "shared") {
+            options.shareds.push({
               key: _name,
               value: _name
             });
-          });
-          silgi.hook("prepare:schema.ts", (options) => {
-            options.importItems[path] ??= {
-              import: [],
-              from: path
-            };
-            options.importItems[path].import.push({
-              name: `${exportName} as ${_name}`,
-              type: true,
-              key: _name
+          }
+          if (type === "context") {
+            options.contexts.push({
+              key: _name,
+              value: _name
             });
+          }
+          options.importItems[path] ??= {
+            import: [],
+            from: relativeWithDot(silgi.options.silgi.serverDir, path)
+          };
+          options.importItems[path].import.push({
+            name: `${exportName} as ${_name}`,
+            key: _name
           });
         }
-      }
+      });
     }
   }
 }
@@ -1611,10 +1580,6 @@ async function createSilgiCLI(config = {}, opts = {}) {
     },
     routeRules: void 0
   };
-  silgi.hook("prepare:scan.ts", (options2) => {
-    options2.services = [];
-    options2.importItems = options2.importItems || {};
-  });
   const routeRules = createRouteRules();
   routeRules.importRules(options.routeRules ?? {});
   silgi.routeRules = routeRules;

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.20.29";
+const version = "0.20.31";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.20.29";
+const version = "0.20.31";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/package.json

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