silgi 0.34.8 → 0.34.10

package/dist/cli/build.mjs

@@ -586,7 +586,20 @@ function categorizeExports(exportedEntities, filePath) {
   }
   return { runtimeExports, typeExports };
 }
-function registerExportsWithHooks(silgiInstance, runtimeExports, typeExports) {
+function transformImportPath(path, packageName, relativeTo) {
+  let importPath = path;
+  if (packageName) {
+    const distMatch = importPath.match(/.*?(\/dist\/.*)/);
+    if (distMatch && distMatch[1]) {
+      importPath = packageName + distMatch[1].substring("/dist".length);
+      importPath = removeExtension(importPath, true);
+    }
+  } else if (relativeTo) {
+    importPath = removeExtension(relativeWithDot(relativeTo, path));
+  }
+  return importPath;
+}
+function registerExportsWithHooks(silgiInstance, runtimeExports, typeExports, packageName) {
   silgiInstance.hook("before:scan.ts", (options) => {
     for (const { exportName, path, uniqueId, category } of runtimeExports) {
       if (!path.includes("vfs")) {
@@ -607,7 +620,7 @@ function registerExportsWithHooks(silgiInstance, runtimeExports, typeExports) {
           break;
       }
       options.addImportItem({
-        specifier: removeExtension(relativeWithDot(silgiInstance.options.silgi.serverDir, path)),
+        specifier: transformImportPath(path, packageName, silgiInstance.options.silgi.serverDir),
         imports: [{ name: exportName, as: uniqueId }]
       });
     }
@@ -623,7 +636,7 @@ function registerExportsWithHooks(silgiInstance, runtimeExports, typeExports) {
       }
       options.addImportItem({
         imports: [{ name: exportName, as: uniqueId }],
-        specifier: removeExtension(relativeWithDot(silgiInstance.options.build.typesDir, path))
+        specifier: transformImportPath(path, packageName, silgiInstance.options.build.typesDir)
       });
     }
   });
@@ -652,7 +665,7 @@ async function verifyDirectoryCaseSensitivity(directoryPath, rootDirectory) {
   } catch {
   }
 }
-async function scanSilgiExports(path, silgiInstance = useSilgiCLI()) {
+async function scanSilgiExports(path, packageName, silgiInstance = useSilgiCLI()) {
   const processedFilePaths = /* @__PURE__ */ new Set();
   const alreadyScannedPaths = [];
   const serverDirectory = path || silgiInstance.options.serverDir;
@@ -698,7 +711,7 @@ async function scanSilgiExports(path, silgiInstance = useSilgiCLI()) {
           allExportedEntities,
           absoluteFilePath
         );
-        registerExportsWithHooks(silgiInstance, runtimeExports, typeExports);
+        registerExportsWithHooks(silgiInstance, runtimeExports, typeExports, packageName);
       } catch (error) {
         consola.error(`Error processing file ${absoluteFilePath}:`, error);
       }
@@ -740,8 +753,6 @@ async function _resolveSilgiModule(silgiModule, silgi) {
         conditions: silgi.options.conditions
       });
       const moduleMetadataPath = new URL("module.json", src);
-      const runtimeFolder = new URL("runtime", src);
-      await scanSilgiExports(runtimeFolder.pathname);
       if (existsSync(moduleMetadataPath)) {
         buildTimeModuleMeta = JSON.parse(await promises.readFile(moduleMetadataPath, "utf-8"));
       } else {
@@ -754,6 +765,10 @@ async function _resolveSilgiModule(silgiModule, silgi) {
           };
         }
       }
+      if (!isPresents(["npm-package"])) {
+        const runtimeFolder = new URL("runtime", src);
+        await scanSilgiExports(runtimeFolder.pathname, buildTimeModuleMeta._packageName);
+      }
     } catch (error) {
       const code = error.code;
       if (code === "MODULE_NOT_FOUND" || code === "ERR_PACKAGE_PATH_NOT_EXPORTED" || code === "ERR_MODULE_NOT_FOUND" || code === "ERR_UNSUPPORTED_DIR_IMPORT" || code === "ENOTDIR") {

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 
-const version = "0.34.8";
+const version = "0.34.10";
 const packageJson = {
 	version: version};
 

package/dist/kit/index.d.mts

@@ -309,7 +309,7 @@ declare const baseHeaderBannerComment: string[];
 declare function processFilePath(src: string): string;
 declare function isPresents(names: PresetName[]): boolean;
 declare function isRuntimePresents(names: PresetName[]): boolean;
-declare function removeExtension(filePath: string): string;
+declare function removeExtension(filePath: string, force?: boolean): string;
 
 export { MODE_RE, MigrationStatus, addCommands, addCoreFile, addImports, addNPMPackage, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineFramework, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, generateMigration, getAllEntries, getIpAddress, getMigration, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory, isH3, isNitro, isNuxt, isPresents, isRuntimePresents, listMigrations, migrationDown, migrationUp, normalizeTemplate, prettyPath, processFilePath, relativeWithDot, removeExtension, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
 export type { FunctionConfig, JsonPatch, MigrationData, MigrationInfo, MigrationOptions, MigrationResult };

package/dist/kit/index.mjs

@@ -67,9 +67,9 @@ function isRuntimePresents(names) {
   const silgi = useSilgi();
   return names.includes(silgi.options.present);
 }
-function removeExtension(filePath) {
+function removeExtension(filePath, force = false) {
   const silgi = useSilgiCLI();
-  if (silgi.options.typescript.removeFileExtension) {
+  if (silgi.options.typescript.removeFileExtension || force) {
     const ext = extname(filePath);
     return ext ? filePath.slice(0, -ext.length) : filePath;
   }

package/package.json

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