silgi 0.20.30 → 0.20.32

package/dist/_chunks/index.mjs

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

package/dist/cli/common.mjs

@@ -1201,6 +1201,8 @@ class SchemaParser {
   // }
 }
 
+const processedScanItems = /* @__PURE__ */ new Map();
+const processedSchemaItems = /* @__PURE__ */ new Map();
 async function scanFiles$1(silgi, watchFiles) {
   const isWatch = watchFiles && watchFiles.length > 0;
   const filePaths = /* @__PURE__ */ new Set();
@@ -1220,6 +1222,13 @@ async function scanFiles$1(silgi, watchFiles) {
       }
     }
   }
+  if (isWatch && watchFiles) {
+    for (const file of watchFiles) {
+      const filePath = resolve(dir, file);
+      processedScanItems.delete(filePath);
+      processedSchemaItems.delete(filePath);
+    }
+  }
   for (const _file of files) {
     const filePath = resolve(dir, _file);
     if (scannedPaths.find((d) => filePath.startsWith(withTrailingSlash(d))) || isIgnored(filePath, silgi)) {
@@ -1299,20 +1308,68 @@ async function scanFiles$1(silgi, watchFiles) {
       }
       silgi.hook("prepare:scan.ts", (options) => {
         for (const { exportName, path, _name, type } of scanTS) {
-          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
-          });
+          const itemKey = `${path}:${exportName}`;
+          if (!processedScanItems.has(path)) {
+            processedScanItems.set(path, /* @__PURE__ */ new Set());
+          }
+          if (processedScanItems.get(path).has(itemKey)) {
+            continue;
+          }
+          processedScanItems.get(path).add(itemKey);
+          switch (type) {
+            case "service":
+              options.services.push(_name);
+              break;
+            case "shared":
+              options.shareds.push(_name);
+              break;
+            case "schema":
+              options.schemas.push(_name);
+              break;
+          }
+          addImport(options, path, exportName, _name, silgi.options.silgi.serverDir);
+        }
+      });
+      silgi.hook("prepare:schema.ts", (options) => {
+        for (const { exportName, path, _name, type } of schemaTS) {
+          const itemKey = `${path}:${exportName}`;
+          if (!processedSchemaItems.has(path)) {
+            processedSchemaItems.set(path, /* @__PURE__ */ new Set());
+          }
+          if (processedSchemaItems.get(path).has(itemKey)) {
+            continue;
+          }
+          processedSchemaItems.get(path).add(itemKey);
+          if (type === "shared") {
+            options.shareds.push({
+              key: _name,
+              value: _name
+            });
+          } else if (type === "context") {
+            options.contexts.push({
+              key: _name,
+              value: _name
+            });
+          }
+          addImport(options, path, exportName, _name, silgi.options.silgi.serverDir);
         }
       });
     }
   }
 }
+function addImport(options, path, exportName, _name, serverDir) {
+  const existingItem = options.importItems[path]?.import.find((item) => item.key === _name);
+  if (existingItem)
+    return;
+  options.importItems[path] ??= {
+    import: [],
+    from: relativeWithDot(serverDir, path)
+  };
+  options.importItems[path].import.push({
+    name: `${exportName} as ${_name}`,
+    key: _name
+  });
+}
 
 async function createStorageCLI(silgi) {
   const storage = createStorage();

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.20.30";
+const version = "0.20.32";
 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.30";
+const version = "0.20.32";
 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.30",
+  "version": "0.20.32",
   "private": false,
   "sideEffects": false,
   "exports": {