silgi 0.20.23 → 0.20.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/_chunks/index.mjs +1 -1
- package/dist/cli/common.mjs +20 -31
- package/dist/meta/index.d.mts +1 -1
- package/dist/meta/index.d.ts +1 -1
- package/package.json +1 -1
package/dist/_chunks/index.mjs
CHANGED
package/dist/cli/common.mjs
CHANGED
|
@@ -903,7 +903,7 @@ async function prepareServerFiles(silgi) {
|
|
|
903
903
|
from: "./configs.ts"
|
|
904
904
|
}
|
|
905
905
|
};
|
|
906
|
-
const
|
|
906
|
+
const createScannedObject = () => ({
|
|
907
907
|
uris: {},
|
|
908
908
|
services: [],
|
|
909
909
|
shareds: [
|
|
@@ -914,8 +914,9 @@ async function prepareServerFiles(silgi) {
|
|
|
914
914
|
schemas: [],
|
|
915
915
|
modulesURIs: {},
|
|
916
916
|
customImports: [],
|
|
917
|
-
importItems
|
|
918
|
-
};
|
|
917
|
+
importItems: JSON.parse(JSON.stringify(importItems))
|
|
918
|
+
});
|
|
919
|
+
const scanned = createScannedObject();
|
|
919
920
|
if (silgi.uris) {
|
|
920
921
|
defu$1(scanned.uris, silgi.uris);
|
|
921
922
|
}
|
|
@@ -923,29 +924,26 @@ async function prepareServerFiles(silgi) {
|
|
|
923
924
|
defu$1(scanned.modulesURIs, silgi.modulesURIs);
|
|
924
925
|
}
|
|
925
926
|
await silgi.callHook("prepare:scan.ts", scanned);
|
|
926
|
-
scanned.
|
|
927
|
-
|
|
928
|
-
scanned.shareds = deduplicateArray(scanned.shareds);
|
|
929
|
-
scanned.customImports = deduplicateArray(scanned.customImports);
|
|
930
|
-
scanned.uris = deduplicateObjectValues(scanned.uris);
|
|
931
|
-
scanned.modulesURIs = deduplicateObjectValues(scanned.modulesURIs);
|
|
932
|
-
for (const key in scanned.importItems) {
|
|
933
|
-
scanned.importItems[key].import = deduplicateImportsByKey(scanned.importItems[key].import);
|
|
934
|
-
}
|
|
935
|
-
if (importItems["#silgi/vfs"].import.length === 0) {
|
|
936
|
-
delete importItems["#silgi/vfs"];
|
|
927
|
+
if (scanned.importItems["#silgi/vfs"].import.length === 0) {
|
|
928
|
+
delete scanned.importItems["#silgi/vfs"];
|
|
937
929
|
}
|
|
938
930
|
if (scanned.services.length > 0) {
|
|
939
|
-
importItems.silgi.import.push({ name: "mergeServices", key: "mergeServices" });
|
|
931
|
+
scanned.importItems.silgi.import.push({ name: "mergeServices", key: "mergeServices" });
|
|
940
932
|
}
|
|
941
933
|
if (scanned.shareds.length > 0) {
|
|
942
|
-
importItems.silgi.import.push({ name: "mergeShared", key: "mergeShared" });
|
|
934
|
+
scanned.importItems.silgi.import.push({ name: "mergeShared", key: "mergeShared" });
|
|
943
935
|
}
|
|
944
936
|
if (scanned.schemas.length > 0) {
|
|
945
|
-
importItems.silgi.import.push({ name: "mergeSchemas", key: "mergeSchemas" });
|
|
937
|
+
scanned.importItems.silgi.import.push({ name: "mergeSchemas", key: "mergeSchemas" });
|
|
946
938
|
}
|
|
939
|
+
for (const key in scanned.importItems) {
|
|
940
|
+
scanned.importItems[key].import = deduplicateImportsByKey(scanned.importItems[key].import);
|
|
941
|
+
}
|
|
942
|
+
scanned.services = deduplicateArray(scanned.services);
|
|
943
|
+
scanned.schemas = deduplicateArray(scanned.schemas);
|
|
944
|
+
scanned.shareds = deduplicateArray(scanned.shareds);
|
|
947
945
|
const importsContent = [
|
|
948
|
-
...Object.entries(importItems).map(([_name, { from, import: imports }]) => {
|
|
946
|
+
...Object.entries(scanned.importItems).map(([_name, { from, import: imports }]) => {
|
|
949
947
|
if (silgi.options.typescript.removeFileExtension) {
|
|
950
948
|
from = from.replace(/\.(js|ts|mjs|cjs|jsx|tsx)$/, "");
|
|
951
949
|
}
|
|
@@ -979,7 +977,10 @@ async function prepareServerFiles(silgi) {
|
|
|
979
977
|
scanned.shareds.length > 0 ? "])" : "}",
|
|
980
978
|
""
|
|
981
979
|
];
|
|
982
|
-
|
|
980
|
+
const afterHookData = [...importData];
|
|
981
|
+
await silgi.callHook("after:prepare:scan.ts", afterHookData);
|
|
982
|
+
importData.length = 0;
|
|
983
|
+
importData.push(...afterHookData);
|
|
983
984
|
importData.unshift(...importsContent);
|
|
984
985
|
return importData;
|
|
985
986
|
}
|
|
@@ -996,18 +997,6 @@ function deduplicateImportsByKey(imports) {
|
|
|
996
997
|
function deduplicateArray(array) {
|
|
997
998
|
return [...new Set(array)];
|
|
998
999
|
}
|
|
999
|
-
function deduplicateObjectValues(obj) {
|
|
1000
|
-
const result = {};
|
|
1001
|
-
const seenValues = /* @__PURE__ */ new Set();
|
|
1002
|
-
for (const [key, value] of Object.entries(obj)) {
|
|
1003
|
-
const valueStr = JSON.stringify(value);
|
|
1004
|
-
if (!seenValues.has(valueStr)) {
|
|
1005
|
-
result[key] = value;
|
|
1006
|
-
seenValues.add(valueStr);
|
|
1007
|
-
}
|
|
1008
|
-
}
|
|
1009
|
-
return result;
|
|
1010
|
-
}
|
|
1011
1000
|
|
|
1012
1001
|
async function writeScanFiles(silgi) {
|
|
1013
1002
|
const data = await prepareServerFiles(silgi);
|
package/dist/meta/index.d.mts
CHANGED
package/dist/meta/index.d.ts
CHANGED