silgi 0.20.23 → 0.20.25

package/dist/_chunks/index.mjs

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

package/dist/cli/common.mjs

@@ -914,42 +914,43 @@ async function prepareServerFiles(silgi) {
     schemas: [],
     modulesURIs: {},
     customImports: [],
-    importItems
+    importItems: JSON.parse(JSON.stringify(importItems))
   };
   if (silgi.uris) {
-    defu$1(scanned.uris, silgi.uris);
+    scanned.uris = { ...silgi.uris };
   }
   if (silgi.modulesURIs) {
-    defu$1(scanned.modulesURIs, silgi.modulesURIs);
-  }
-  await silgi.callHook("prepare:scan.ts", scanned);
-  scanned.services = deduplicateArray(scanned.services);
-  scanned.schemas = deduplicateArray(scanned.schemas);
-  scanned.shareds = deduplicateArray(scanned.shareds);
-  scanned.customImports = deduplicateArray(scanned.customImports);
-  scanned.uris = deduplicateObjectValues(scanned.uris);
-  scanned.modulesURIs = deduplicateObjectValues(scanned.modulesURIs);
-  for (const key in scanned.importItems) {
-    scanned.importItems[key].import = deduplicateImportsByKey(scanned.importItems[key].import);
+    scanned.modulesURIs = { ...silgi.modulesURIs };
   }
-  if (importItems["#silgi/vfs"].import.length === 0) {
-    delete importItems["#silgi/vfs"];
+  const prepareScanned = JSON.parse(JSON.stringify(scanned));
+  await silgi.callHook("prepare:scan.ts", prepareScanned);
+  Object.assign(scanned, prepareScanned);
+  if (scanned.importItems["#silgi/vfs"]?.import?.length === 0) {
+    delete scanned.importItems["#silgi/vfs"];
   }
   if (scanned.services.length > 0) {
-    importItems.silgi.import.push({ name: "mergeServices", key: "mergeServices" });
+    scanned.importItems.silgi.import.push({ name: "mergeServices", key: "mergeServices" });
   }
   if (scanned.shareds.length > 0) {
-    importItems.silgi.import.push({ name: "mergeShared", key: "mergeShared" });
+    scanned.importItems.silgi.import.push({ name: "mergeShared", key: "mergeShared" });
   }
   if (scanned.schemas.length > 0) {
-    importItems.silgi.import.push({ name: "mergeSchemas", key: "mergeSchemas" });
+    scanned.importItems.silgi.import.push({ name: "mergeSchemas", key: "mergeSchemas" });
   }
+  for (const key in scanned.importItems) {
+    scanned.importItems[key].import = deduplicateImportsByKey(scanned.importItems[key].import);
+  }
+  scanned.services = deduplicateArray(scanned.services);
+  scanned.schemas = deduplicateArray(scanned.schemas);
+  scanned.shareds = deduplicateArray(scanned.shareds);
+  scanned.customImports = deduplicateArray(scanned.customImports);
   const importsContent = [
-    ...Object.entries(importItems).map(([_name, { from, import: imports }]) => {
+    ...Object.entries(scanned.importItems).map(([_name, { from, import: imports }]) => {
+      let fromPath = from;
       if (silgi.options.typescript.removeFileExtension) {
-        from = from.replace(/\.(js|ts|mjs|cjs|jsx|tsx)$/, "");
+        fromPath = from.replace(/\.(js|ts|mjs|cjs|jsx|tsx)$/, "");
       }
-      return `import { ${imports.map(({ type, name }) => type ? `type ${name}` : name).join(", ")} } from '${from}'`;
+      return `import { ${imports.map(({ type, name }) => type ? `type ${name}` : name).join(", ")} } from '${fromPath}'`;
     }),
     "",
     ...scanned.customImports,
@@ -979,7 +980,10 @@ async function prepareServerFiles(silgi) {
     scanned.shareds.length > 0 ? "])" : "}",
     ""
   ];
-  await silgi.callHook("after:prepare:scan.ts", importData);
+  const afterHookData = [...importData];
+  await silgi.callHook("after:prepare:scan.ts", afterHookData);
+  importData.length = 0;
+  importData.push(...afterHookData);
   importData.unshift(...importsContent);
   return importData;
 }
@@ -996,18 +1000,6 @@ function deduplicateImportsByKey(imports) {
 function deduplicateArray(array) {
   return [...new Set(array)];
 }
-function deduplicateObjectValues(obj) {
-  const result = {};
-  const seenValues = /* @__PURE__ */ new Set();
-  for (const [key, value] of Object.entries(obj)) {
-    const valueStr = JSON.stringify(value);
-    if (!seenValues.has(valueStr)) {
-      result[key] = value;
-      seenValues.add(valueStr);
-    }
-  }
-  return result;
-}
 
 async function writeScanFiles(silgi) {
   const data = await prepareServerFiles(silgi);

package/dist/meta/index.d.mts

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