npm - @vistagenic/vista - Versions diffs - 0.2.13 → 0.2.14 - Mend

@vistagenic/vista 0.2.13 → 0.2.14

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.

Files changed (6) hide show

package/dist/server/project-alias-resolver.d.ts +4 -0
package/dist/server/project-alias-resolver.js +217 -0
package/dist/server/rsc-engine.js +6 -0
package/dist/server/rsc-upstream.js +8 -2
package/dist/server/static-generator.js +6 -0
package/package.json +149 -148

package/dist/server/project-alias-resolver.d.ts ADDED Viewed

@@ -0,0 +1,4 @@
+export interface ProjectAliasResolver {
+    resolve: (request: string) => string | null;
+}
+export declare function createProjectAliasResolver(cwd: string, resolveFromWorkspace: (specifier: string, cwd: string) => string): ProjectAliasResolver | null;

package/dist/server/project-alias-resolver.js ADDED Viewed

@@ -0,0 +1,217 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createProjectAliasResolver = createProjectAliasResolver;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const projectAliasCache = new Map();
+function stripJsonComments(input) {
+    let result = '';
+    let inString = false;
+    let stringQuote = '';
+    let isEscaped = false;
+    let inLineComment = false;
+    let inBlockComment = false;
+    for (let index = 0; index < input.length; index++) {
+        const current = input[index];
+        const next = input[index + 1];
+        if (inLineComment) {
+            if (current === '\n') {
+                inLineComment = false;
+                result += current;
+            }
+            continue;
+        }
+        if (inBlockComment) {
+            if (current === '*' && next === '/') {
+                inBlockComment = false;
+                index++;
+            }
+            continue;
+        }
+        if (inString) {
+            result += current;
+            if (isEscaped) {
+                isEscaped = false;
+                continue;
+            }
+            if (current === '\\') {
+                isEscaped = true;
+                continue;
+            }
+            if (current === stringQuote) {
+                inString = false;
+                stringQuote = '';
+            }
+            continue;
+        }
+        if ((current === '"' || current === "'") && !inString) {
+            inString = true;
+            stringQuote = current;
+            result += current;
+            continue;
+        }
+        if (current === '/' && next === '/') {
+            inLineComment = true;
+            index++;
+            continue;
+        }
+        if (current === '/' && next === '*') {
+            inBlockComment = true;
+            index++;
+            continue;
+        }
+        result += current;
+    }
+    return result;
+}
+function isBareSpecifier(request) {
+    if (!request)
+        return false;
+    if (request.startsWith('.') || request.startsWith('/'))
+        return false;
+    return !/^[A-Za-z]:[\\/]/.test(request);
+}
+function resolveAliasTargetPath(candidatePath) {
+    const resolvedBase = path_1.default.resolve(candidatePath);
+    const extensions = ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.cjs', '.json'];
+    const directCandidates = path_1.default.extname(resolvedBase)
+        ? [resolvedBase]
+        : [resolvedBase, ...extensions.map((extension) => `${resolvedBase}${extension}`)];
+    for (const candidate of directCandidates) {
+        try {
+            if (fs_1.default.existsSync(candidate) && fs_1.default.statSync(candidate).isFile()) {
+                return candidate;
+            }
+        }
+        catch {
+            // continue
+        }
+    }
+    try {
+        if (fs_1.default.existsSync(resolvedBase) && fs_1.default.statSync(resolvedBase).isDirectory()) {
+            const packageJsonPath = path_1.default.join(resolvedBase, 'package.json');
+            if (fs_1.default.existsSync(packageJsonPath)) {
+                try {
+                    const packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf-8'));
+                    if (packageJson.main) {
+                        const packageMainPath = resolveAliasTargetPath(path_1.default.join(resolvedBase, packageJson.main));
+                        if (packageMainPath)
+                            return packageMainPath;
+                    }
+                }
+                catch {
+                    // ignore invalid package.json while resolving alias target
+                }
+            }
+            for (const extension of extensions) {
+                const indexPath = path_1.default.join(resolvedBase, `index${extension}`);
+                if (fs_1.default.existsSync(indexPath) && fs_1.default.statSync(indexPath).isFile()) {
+                    return indexPath;
+                }
+            }
+        }
+    }
+    catch {
+        // continue
+    }
+    return null;
+}
+function createProjectAliasResolver(cwd, resolveFromWorkspace) {
+    if (projectAliasCache.has(cwd)) {
+        return projectAliasCache.get(cwd) ?? null;
+    }
+    const configPath = ['tsconfig.json', 'jsconfig.json']
+        .map((filename) => path_1.default.join(cwd, filename))
+        .find((filename) => fs_1.default.existsSync(filename));
+    if (!configPath) {
+        projectAliasCache.set(cwd, null);
+        return null;
+    }
+    let compilerOptions = null;
+    try {
+        const typescriptPath = resolveFromWorkspace('typescript', cwd);
+        const ts = require(typescriptPath);
+        const readResult = ts.readConfigFile(configPath, ts.sys.readFile);
+        if (!readResult.error) {
+            compilerOptions = readResult.config?.compilerOptions ?? null;
+        }
+    }
+    catch {
+        // fallback to plain JSON parse below
+    }
+    if (!compilerOptions) {
+        try {
+            const rawConfig = fs_1.default.readFileSync(configPath, 'utf-8');
+            const parsedConfig = JSON.parse(stripJsonComments(rawConfig));
+            compilerOptions = parsedConfig.compilerOptions ?? null;
+        }
+        catch {
+            compilerOptions = null;
+        }
+    }
+    const configDir = path_1.default.dirname(configPath);
+    const rawPaths = compilerOptions?.paths;
+    if (!rawPaths || typeof rawPaths !== 'object') {
+        projectAliasCache.set(cwd, null);
+        return null;
+    }
+    const baseDir = path_1.default.resolve(configDir, typeof compilerOptions?.baseUrl === 'string' && compilerOptions.baseUrl.trim()
+        ? compilerOptions.baseUrl
+        : '.');
+    const exactEntries = new Map();
+    const wildcardEntries = [];
+    for (const [pattern, targetsValue] of Object.entries(rawPaths)) {
+        const targets = Array.isArray(targetsValue)
+            ? targetsValue.filter((entry) => typeof entry === 'string' && entry.trim().length > 0)
+            : [];
+        if (targets.length === 0)
+            continue;
+        if (pattern.includes('*')) {
+            const starIndex = pattern.indexOf('*');
+            wildcardEntries.push({
+                prefix: pattern.slice(0, starIndex),
+                suffix: pattern.slice(starIndex + 1),
+                targets,
+            });
+        }
+        else {
+            exactEntries.set(pattern, targets);
+        }
+    }
+    const resolver = {
+        resolve(request) {
+            if (!isBareSpecifier(request))
+                return null;
+            const resolveTargets = (targets, wildcardValue) => {
+                for (const targetPattern of targets) {
+                    const replacedTarget = wildcardValue === undefined ? targetPattern : targetPattern.replace('*', wildcardValue);
+                    const candidate = resolveAliasTargetPath(path_1.default.resolve(baseDir, replacedTarget));
+                    if (candidate) {
+                        return candidate;
+                    }
+                }
+                return null;
+            };
+            const exactMatch = exactEntries.get(request);
+            if (exactMatch) {
+                return resolveTargets(exactMatch);
+            }
+            for (const entry of wildcardEntries) {
+                if (!request.startsWith(entry.prefix) || !request.endsWith(entry.suffix)) {
+                    continue;
+                }
+                const wildcardValue = request.slice(entry.prefix.length, request.length - entry.suffix.length);
+                const resolved = resolveTargets(entry.targets, wildcardValue);
+                if (resolved) {
+                    return resolved;
+                }
+            }
+            return null;
+        },
+    };
+    projectAliasCache.set(cwd, resolver);
+    return resolver;
+}

package/dist/server/rsc-engine.js CHANGED Viewed

@@ -80,6 +80,7 @@ const request_context_1 = require("./request-context");
 const app_router_runtime_1 = require("./app-router-runtime");
 const fetch_policy_1 = require("./fetch-policy");
 const vista_import_map_1 = require("./vista-import-map");
+const project_alias_resolver_1 = require("./project-alias-resolver");
 // Support CSS imports on server runtime
 // - Regular .css: ignored (handled by PostCSS)
 // - .module.css: return empty class mapping (webpack build handles real mappings)
@@ -273,10 +274,15 @@ function installSingleReactResolution(cwd) {
         }
     }
     originalResolveFilename = CjsModule._resolveFilename;
+    const projectAliasResolver = (0, project_alias_resolver_1.createProjectAliasResolver)(cwd, resolveFromWorkspace);
     CjsModule._resolveFilename = function (request, parent, isMain, options) {
         const vistaResolvedPath = resolveVistaInternalRequest(request);
         if (vistaResolvedPath)
             return vistaResolvedPath;
+        const aliasResolvedPath = projectAliasResolver?.resolve(request);
+        if (aliasResolvedPath) {
+            return originalResolveFilename.call(this, aliasResolvedPath, parent, isMain, options);
+        }
         if (request === 'react')
             return reactPath;
         if (request === 'react-dom')

package/dist/server/rsc-upstream.js CHANGED Viewed

@@ -20,6 +20,7 @@ const fetch_policy_1 = require("./fetch-policy");
 const runtime_artifacts_1 = require("./runtime-artifacts");
 const config_1 = require("../config");
 const vista_import_map_1 = require("./vista-import-map");
+const project_alias_resolver_1 = require("./project-alias-resolver");
 // NOTE: RouteErrorBoundary and RouteSuspense are 'use client' components.
 // Under --conditions react-server, React.Component is not available, so we
 // must NOT import them at the top level.  Instead we lazy-require them after
@@ -190,7 +191,7 @@ function isClientBoundaryFile(filename, transpiledSource) {
     clientDirectiveCache.set(filename, isClient);
     return isClient;
 }
-function installSingleReactResolution() {
+function installSingleReactResolution(cwd) {
     if (reactResolutionInstalled)
         return;
     let reactPath;
@@ -203,10 +204,15 @@ function installSingleReactResolution() {
         return;
     }
     originalResolveFilename = CjsModule._resolveFilename;
+    const projectAliasResolver = (0, project_alias_resolver_1.createProjectAliasResolver)(cwd, resolveFromWorkspace);
     CjsModule._resolveFilename = function (request, parent, isMain, options) {
         const vistaResolvedPath = resolveVistaInternalRequest(request);
         if (vistaResolvedPath)
             return vistaResolvedPath;
+        const aliasResolvedPath = projectAliasResolver?.resolve(request);
+        if (aliasResolvedPath) {
+            return originalResolveFilename.call(this, aliasResolvedPath, parent, isMain, options);
+        }
         if (request === 'react')
             return reactPath;
         if (request === 'react-dom')
@@ -472,7 +478,7 @@ function startUpstream() {
     const isDev = process.env.NODE_ENV !== 'production';
     const port = resolvePort(3101);
     const vistaDirRoot = path_1.default.join(cwd, constants_1.BUILD_DIR);
-    installSingleReactResolution();
+    installSingleReactResolution(runtimeRoot);
     setupTypeScriptRuntime(runtimeRoot);
     const flightServerPath = resolveFromWorkspace('react-server-dom-webpack/server.node', cwd);
     const flightServer = require(flightServerPath);

package/dist/server/static-generator.js CHANGED Viewed

@@ -27,6 +27,7 @@ const spawn_permissions_1 = require("./spawn-permissions");
 const config_1 = require("../config");
 const ppr_1 = require("./ppr");
 const vista_import_map_1 = require("./vista-import-map");
+const project_alias_resolver_1 = require("./project-alias-resolver");
 const CjsModule = require('module');
 let staticRuntimeReady = false;
 let reactResolutionInstalled = false;
@@ -72,10 +73,15 @@ function installSingleReactResolution(cwd) {
         }
     }
     originalResolveFilename = CjsModule._resolveFilename;
+    const projectAliasResolver = (0, project_alias_resolver_1.createProjectAliasResolver)(cwd, resolveFromWorkspace);
     CjsModule._resolveFilename = function (request, parent, isMain, options) {
         const vistaResolvedPath = resolveVistaInternalRequest(request);
         if (vistaResolvedPath)
             return vistaResolvedPath;
+        const aliasResolvedPath = projectAliasResolver?.resolve(request);
+        if (aliasResolvedPath) {
+            return originalResolveFilename.call(this, aliasResolvedPath, parent, isMain, options);
+        }
         if (request === 'react')
             return reactPath;
         if (request === 'react-dom')

package/package.json CHANGED Viewed

@@ -1,148 +1,149 @@
-{
-  "name": "@vistagenic/vista",
-  "version": "0.2.13",
-  "description": "The React Framework for Visionaries - Rust-powered SSR with Server Components",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vistagen/Vista-Js.git",
-    "directory": "packages/vista"
-  },
-  "author": "Vista Team",
-  "license": "MIT",
-  "keywords": [
-    "react",
-    "framework",
-    "ssr",
-    "server-components",
-    "rsc",
-    "rust",
-    "swc",
-    "vista"
-  ],
-  "files": [
-    "dist",
-    "bin"
-  ],
-  "exports": {
-    ".": {
-      "react-server": "./dist/react-server.js",
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
-    },
-    "./link": {
-      "types": "./dist/client/link.d.ts",
-      "default": "./dist/client/link.js"
-    },
-    "./image": {
-      "react-server": "./dist/image/react-server.js",
-      "types": "./dist/image/index.d.ts",
-      "default": "./dist/image/index.js"
-    },
-    "./router": {
-      "types": "./dist/client/router.d.ts",
-      "default": "./dist/client/router.js"
-    },
-    "./navigation": {
-      "types": "./dist/client/navigation.d.ts",
-      "default": "./dist/client/navigation.js"
-    },
-    "./dynamic": {
-      "types": "./dist/client/dynamic.d.ts",
-      "default": "./dist/client/dynamic.js"
-    },
-    "./script": {
-      "types": "./dist/client/script.d.ts",
-      "default": "./dist/client/script.js"
-    },
-    "./font": {
-      "types": "./dist/font/index.d.ts",
-      "default": "./dist/font/index.js"
-    },
-    "./font/google": {
-      "types": "./dist/font/google.d.ts",
-      "default": "./dist/font/google.js"
-    },
-    "./font/local": {
-      "types": "./dist/font/local.d.ts",
-      "default": "./dist/font/local.js"
-    },
-    "./head": {
-      "react-server": "./dist/client/head.react-server.js",
-      "types": "./dist/client/head.d.ts",
-      "default": "./dist/client/head.js"
-    },
-    "./config": {
-      "types": "./dist/config.d.ts",
-      "default": "./dist/config.js"
-    },
-    "./stack": {
-      "types": "./dist/stack/index.d.ts",
-      "default": "./dist/stack/index.js"
-    },
-    "./stack/client": {
-      "types": "./dist/stack/client/index.d.ts",
-      "default": "./dist/stack/client/index.js"
-    },
-    "./client/rsc-router": {
-      "types": "./dist/client/rsc-router.d.ts",
-      "default": "./dist/client/rsc-router.js"
-    },
-    "./client/server-actions": {
-      "types": "./dist/client/server-actions.d.ts",
-      "default": "./dist/client/server-actions.js"
-    },
-    "./server": {
-      "types": "./dist/server/index.d.ts",
-      "default": "./dist/server/index.js"
-    },
-    "./server/runtime-actions": {
-      "types": "./dist/server/runtime-actions.d.ts",
-      "default": "./dist/server/runtime-actions.js"
-    },
-    "./cache": {
-      "types": "./dist/server/cache.d.ts",
-      "default": "./dist/server/cache.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "bin": {
-    "vista": "bin/vista.js"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "build": "tsc"
-  },
-  "dependencies": {
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
-    "@swc-node/register": "^1.9.0",
-    "@swc/core": "^1.4.0",
-    "chokidar": "^3.6.0",
-    "css-loader": "^7.1.2",
-    "esbuild": "^0.24.2",
-    "express": "^4.21.2",
-    "mini-css-extract-plugin": "^2.9.4",
-    "null-loader": "^4.0.1",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "react-refresh": "^0.14.0",
-    "react-server-dom-webpack": "^19.0.0",
-    "swc-loader": "^0.2.6",
-    "ts-node": "^10.9.2",
-    "webpack": "^5.90.0",
-    "webpack-dev-middleware": "^7.0.0",
-    "webpack-hot-middleware": "^2.26.0"
-  },
-  "devDependencies": {
-    "@types/express": "^5.0.0",
-    "@types/node": "^22.10.2",
-    "@types/react": "^19.0.1",
-    "@types/react-dom": "^19.0.2",
-    "@types/webpack": "^5.28.5",
-    "@types/webpack-hot-middleware": "^2.25.9",
-    "typescript": "^5.7.2"
-  }
-}
+{
+  "name": "@vistagenic/vista",
+  "version": "0.2.14",
+  "description": "The React Framework for Visionaries - Rust-powered SSR with Server Components",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vistakit/Vista-Js.git",
+    "directory": "packages/vista"
+  },
+  "author": "Vista Team",
+  "license": "MIT",
+  "keywords": [
+    "react",
+    "framework",
+    "ssr",
+    "server-components",
+    "rsc",
+    "rust",
+    "swc",
+    "vista"
+  ],
+  "files": [
+    "dist",
+    "bin"
+  ],
+  "exports": {
+    ".": {
+      "react-server": "./dist/react-server.js",
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./link": {
+      "types": "./dist/client/link.d.ts",
+      "default": "./dist/client/link.js"
+    },
+    "./image": {
+      "react-server": "./dist/image/react-server.js",
+      "types": "./dist/image/index.d.ts",
+      "default": "./dist/image/index.js"
+    },
+    "./router": {
+      "types": "./dist/client/router.d.ts",
+      "default": "./dist/client/router.js"
+    },
+    "./navigation": {
+      "types": "./dist/client/navigation.d.ts",
+      "default": "./dist/client/navigation.js"
+    },
+    "./dynamic": {
+      "types": "./dist/client/dynamic.d.ts",
+      "default": "./dist/client/dynamic.js"
+    },
+    "./script": {
+      "types": "./dist/client/script.d.ts",
+      "default": "./dist/client/script.js"
+    },
+    "./font": {
+      "types": "./dist/font/index.d.ts",
+      "default": "./dist/font/index.js"
+    },
+    "./font/google": {
+      "types": "./dist/font/google.d.ts",
+      "default": "./dist/font/google.js"
+    },
+    "./font/local": {
+      "types": "./dist/font/local.d.ts",
+      "default": "./dist/font/local.js"
+    },
+    "./head": {
+      "react-server": "./dist/client/head.react-server.js",
+      "types": "./dist/client/head.d.ts",
+      "default": "./dist/client/head.js"
+    },
+    "./config": {
+      "types": "./dist/config.d.ts",
+      "default": "./dist/config.js"
+    },
+    "./stack": {
+      "types": "./dist/stack/index.d.ts",
+      "default": "./dist/stack/index.js"
+    },
+    "./stack/client": {
+      "types": "./dist/stack/client/index.d.ts",
+      "default": "./dist/stack/client/index.js"
+    },
+    "./client/rsc-router": {
+      "types": "./dist/client/rsc-router.d.ts",
+      "default": "./dist/client/rsc-router.js"
+    },
+    "./client/server-actions": {
+      "types": "./dist/client/server-actions.d.ts",
+      "default": "./dist/client/server-actions.js"
+    },
+    "./server": {
+      "types": "./dist/server/index.d.ts",
+      "default": "./dist/server/index.js"
+    },
+    "./server/runtime-actions": {
+      "types": "./dist/server/runtime-actions.d.ts",
+      "default": "./dist/server/runtime-actions.js"
+    },
+    "./cache": {
+      "types": "./dist/server/cache.d.ts",
+      "default": "./dist/server/cache.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "bin": {
+    "vista": "bin/vista.js"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "build": "tsc"
+  },
+  "dependencies": {
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
+    "@swc-node/register": "^1.9.0",
+    "@swc/core": "^1.4.0",
+    "chokidar": "^3.6.0",
+    "css-loader": "^7.1.2",
+    "esbuild": "^0.24.2",
+    "express": "^4.21.2",
+    "mini-css-extract-plugin": "^2.9.4",
+    "null-loader": "^4.0.1",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "react-refresh": "^0.14.0",
+    "react-server-dom-webpack": "^19.0.0",
+    "swc-loader": "^0.2.6",
+    "ts-node": "^10.9.2",
+    "webpack": "^5.90.0",
+    "webpack-dev-middleware": "^7.0.0",
+    "webpack-hot-middleware": "^2.26.0"
+  },
+  "devDependencies": {
+    "@types/express": "^5.0.0",
+    "@types/node": "^22.10.2",
+    "@types/react": "^19.0.1",
+    "@types/react-dom": "^19.0.2",
+    "@types/webpack": "^5.28.5",
+    "@types/webpack-hot-middleware": "^2.25.9",
+    "typescript": "^5.7.2"
+  },
+  "gitHead": "d1b9f715d6365d8e1f553e96b752fbce8d98df7c"
+}