@yahoo/uds-create-loader 5.42.2 → 5.42.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yahoo/uds-create-loader",
-  "version": "5.42.2",
+  "version": "5.42.4",
   "type": "module",
   "private": false,
   "files": [
@@ -38,7 +38,7 @@
     "test:update": "bun test src/ --update-snapshots"
   },
   "dependencies": {
-    "@yahoo/uds-create-config": "5.42.2",
+    "@yahoo/uds-create-config": "5.42.4",
     "@babel/parser": "^7.29.0",
     "@babel/traverse": "^7.29.0",
     "@babel/types": "^7.29.0",
@@ -63,5 +63,5 @@
       "optional": true
     }
   },
-  "udsSchemaVersion": 20261020173914
+  "udsSchemaVersion": 20261020182408
 }

package/src/loader.test.ts

@@ -90,8 +90,8 @@ export function Demo() {
 
   it("runs a linked system's source import as the module the build emitted for it", () => {
     const source = `
-import { Avatar } from '@/uds/registry/yos/avatar';
-import { useTone } from "@/uds/registry/yahoo-os-v3-bridge/hooks/use-tone";
+import { Avatar } from '@/uds/linked/yos/avatar';
+import { useTone } from "@/uds/linked/yahoo-os-v3-bridge/hooks/use-tone";
 
 export function Demo() {
   return <Avatar tone={useTone()} />;
@@ -103,7 +103,7 @@ export function Demo() {
     expect(output).toContain(
       'from "#uds/components/_linked/yahoo-os-v3-bridge/hooks/use-tone"',
     );
-    expect(output).not.toContain('@/uds/registry/');
+    expect(output).not.toContain('@/uds/linked/');
   });
 
   it('follows the aliases the system declares', () => {
@@ -113,14 +113,14 @@ export function Demo() {
       })
       .toJSON() as SerializedConfig;
     const source = `
-import { Avatar } from '~/ds/registry/yos/avatar';
-import { Stale } from '@/uds/registry/yos/stale';
+import { Avatar } from '~/ds/linked/yos/avatar';
+import { Stale } from '@/uds/linked/yos/stale';
 `;
     const output = runLoader(source, config);
 
     expect(output).toContain("from '#ds/components/_linked/yos/avatar'");
     // Not this system's alias, so not this loader's to rewrite.
-    expect(output).toContain("from '@/uds/registry/yos/stale'");
+    expect(output).toContain("from '@/uds/linked/yos/stale'");
   });
 
   it('does not rewrite relative imports', () => {
@@ -294,13 +294,13 @@ export function Demo() {
     expect(output).toBe(source);
   });
 
-  it('skips an explicit build.registryDir', () => {
+  it('skips an explicit build.linkedDir', () => {
     const box = makeBoxConfig();
     const config = {
       ...box,
       items: {
         ...box.items,
-        settings: { settings: { build: { registryDir: 'vendor/linked' } } },
+        settings: { settings: { build: { linkedDir: 'vendor/linked' } } },
       },
     };
     const source = `

package/src/loader.ts

@@ -1,9 +1,10 @@
 import { parse } from '@babel/parser';
 import _traverse from '@babel/traverse';
 import {
+  resolveLinkedAlias,
+  resolveLinkedDir,
   resolveOutputAlias,
-  resolveRegistryDir,
-  resolveSourceAlias,
+  type resolveSourceAlias,
 } from '@yahoo/uds-create-config';
 import type { LoaderDefinitionFunction } from 'webpack';
 import {
@@ -74,26 +75,26 @@ const transformLoader: LoaderDefinitionFunction = function (source) {
   const config = loadUdsConfig(dataPath, isDev);
   if (!config) return source;
 
-  // Configurable registry location (`build.registryDir`) — same skip rationale as above. The
+  // Configurable registry location (`build.linkedDir`) — same skip rationale as above. The
   // settings are one item of the `settings` kind in a serialized config, keyed by the kind.
   const build = (
     config as {
       items?: {
         settings?: {
           settings?: {
-            build?: Parameters<typeof resolveRegistryDir>[0] &
+            build?: Parameters<typeof resolveLinkedDir>[0] &
               Parameters<typeof resolveSourceAlias>[0];
           };
         };
       };
     }
   ).items?.settings?.settings?.build;
-  const registryRel = resolveRegistryDir(build);
+  const linkedRel = resolveLinkedDir(build);
   // The prefixes the system declares: its sources' (`@/uds`) and its build output's (`#uds`). A linked
-  // system's source is imported beneath the first, `<sourceAlias>/registry/<slug>/…`.
+  // system's source is imported beneath the first, `<sourceAlias>/linked/<slug>/…`.
   const outputAlias = resolveOutputAlias(build);
-  const linkedAlias = `${resolveSourceAlias(build)}/registry/`;
-  if (resourcePath.replace(/\\/g, '/').includes(`/${registryRel}/`)) {
+  const linkedAlias = resolveLinkedAlias(build);
+  if (resourcePath.replace(/\\/g, '/').includes(`/${linkedRel}/`)) {
     return source;
   }
 
@@ -152,7 +153,7 @@ const transformLoader: LoaderDefinitionFunction = function (source) {
       const importSource: string | undefined = nodePath.node.source?.value;
       if (!importSource) return;
 
-      // A linked system's source, imported by its alias for the types (`@/uds/registry/yos/avatar`),
+      // A linked system's source, imported by its alias for the types (`@/uds/linked/yos/avatar`),
       // runs as the module the build emitted from it — the same path under `components/_linked/`.
       if (importSource.startsWith(linkedAlias)) {
         const sourceNode = nodePath.node.source;

package/src/next.test.ts

@@ -7,12 +7,12 @@ import { withUds } from './next';
 const TMP = path.join(import.meta.dir, '../dist/.test-tmp/next-registry-deps');
 
 // The default registry, beside the conventional components root.
-const REGISTRY_REL = 'src/uds/registry';
+const REGISTRY_REL = 'src/uds/linked';
 
 function writeFixture(args: {
   registryDeps?: Record<string, string>;
   consumerHas?: string[];
-  build?: { registryDir?: string };
+  build?: { linkedDir?: string };
 }): string {
   const root = path.join(TMP, `proj-${Math.random().toString(36).slice(2, 8)}`);
 
@@ -25,13 +25,10 @@ function writeFixture(args: {
   );
 
   if (args.registryDeps) {
-    const registryDir = path.join(
-      root,
-      args.build?.registryDir ?? REGISTRY_REL,
-    );
-    mkdirSync(path.join(registryDir, 'node_modules'), { recursive: true });
+    const linkedDir = path.join(root, args.build?.linkedDir ?? REGISTRY_REL);
+    mkdirSync(path.join(linkedDir, 'node_modules'), { recursive: true });
     writeFileSync(
-      path.join(registryDir, 'package.json'),
+      path.join(linkedDir, 'package.json'),
       JSON.stringify({
         name: '@yahoo/uds-linked-runtime-deps',
         private: true,
@@ -39,7 +36,7 @@ function writeFixture(args: {
       }),
     );
     for (const name of Object.keys(args.registryDeps)) {
-      const pkgDir = path.join(registryDir, 'node_modules', name);
+      const pkgDir = path.join(linkedDir, 'node_modules', name);
       mkdirSync(pkgDir, { recursive: true });
       writeFileSync(
         path.join(pkgDir, 'package.json'),
@@ -145,17 +142,17 @@ describe('withUds — linked-registry dependency resolution', () => {
     ).toBeUndefined();
   });
 
-  it('honors a custom build.registryDir', () => {
+  it('honors a custom build.linkedDir', () => {
     const root = writeFixture({
       registryDeps: { clsx: '^2.0.0' },
-      build: { registryDir: 'src/uds/registry' },
+      build: { linkedDir: 'src/uds/linked' },
     });
 
     const config = applyIn(root, () => withUds({}));
 
     const aliases = (config as { turbopack?: { resolveAlias?: unknown } })
       .turbopack?.resolveAlias as Record<string, string>;
-    expect(aliases.clsx).toBe('./src/uds/registry/node_modules/clsx');
+    expect(aliases.clsx).toBe('./src/uds/linked/node_modules/clsx');
   });
 
   it('preserves caller-provided resolveAlias entries', () => {

package/src/next.ts

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync } from 'node:fs';
 import path from 'node:path';
-import { resolveRegistryDir } from '@yahoo/uds-create-config';
+import { resolveLinkedDir } from '@yahoo/uds-create-config';
 import type { NextConfig } from 'next';
 
 export interface WithUdsOptions {
@@ -22,12 +22,12 @@ function resolveLoaderPath(): string {
   }
 }
 
-/** The linked registry's install root + dep names, read from the manifest
+/** The linked directory + its dep names, read from the manifest
  *  `uds pull` generates. Null when the project has no linked runtime deps. */
-function readRegistryDeps(
+function readLinkedDeps(
   outputDir: string,
-): { registryDirRel: string; nodeModules: string; deps: string[] } | null {
-  let buildOptions: { registryDir?: string } | undefined;
+): { linkedDirRel: string; nodeModules: string; deps: string[] } | null {
+  let buildOptions: { linkedDir?: string } | undefined;
   try {
     buildOptions = (
       JSON.parse(
@@ -43,13 +43,13 @@ function readRegistryDeps(
     return null;
   }
 
-  const registryDirRel = resolveRegistryDir(buildOptions);
+  const linkedDirRel = resolveLinkedDir(buildOptions);
 
   let deps: string[];
   try {
     const manifest = JSON.parse(
       readFileSync(
-        path.resolve(process.cwd(), registryDirRel, 'package.json'),
+        path.resolve(process.cwd(), linkedDirRel, 'package.json'),
         'utf-8',
       ),
     ) as { dependencies?: Record<string, string> };
@@ -60,21 +60,17 @@ function readRegistryDeps(
 
   if (deps.length === 0) return null;
 
-  const nodeModules = path.resolve(
-    process.cwd(),
-    registryDirRel,
-    'node_modules',
-  );
+  const nodeModules = path.resolve(process.cwd(), linkedDirRel, 'node_modules');
   if (!existsSync(nodeModules)) return null;
 
-  return { registryDirRel, nodeModules, deps };
+  return { linkedDirRel, nodeModules, deps };
 }
 
 /** Turbopack has no resolve.modules equivalent, so alias each registry dep
  *  to its installed path — only when the consumer's own install lacks it
  *  (the consumer's version must always win). */
-function buildRegistryAliasMap(
-  registry: NonNullable<ReturnType<typeof readRegistryDeps>>,
+function buildLinkedAliasMap(
+  registry: NonNullable<ReturnType<typeof readLinkedDeps>>,
 ): Record<string, string> {
   const aliases: Record<string, string> = {};
 
@@ -83,7 +79,7 @@ function buildRegistryAliasMap(
     if (existsSync(consumerCopy)) continue;
 
     if (existsSync(path.join(registry.nodeModules, dep))) {
-      aliases[dep] = `./${registry.registryDirRel}/node_modules/${dep}`;
+      aliases[dep] = `./${registry.linkedDirRel}/node_modules/${dep}`;
     }
   }
 
@@ -132,20 +128,20 @@ function applyUds(
     }
   }
 
-  // Linked-system runtime deps live in `<registryDir>/node_modules` (written
+  // Linked-system runtime deps live in `<linkedDir>/node_modules` (written
   // by `uds pull`), off the walk-up path of the downleveled `.uds` modules
   // that import them.
-  const registry = readRegistryDeps(outputDir);
-  const registryAliases = registry ? buildRegistryAliasMap(registry) : {};
+  const registry = readLinkedDeps(outputDir);
+  const linkedAliases = registry ? buildLinkedAliasMap(registry) : {};
 
   return {
     ...nextConfig,
     turbopack: {
       ...turbopack,
-      ...(Object.keys(registryAliases).length > 0
+      ...(Object.keys(linkedAliases).length > 0
         ? {
             resolveAlias: {
-              ...registryAliases,
+              ...linkedAliases,
               ...turbopack.resolveAlias,
             },
           }