nudge-ui 0.2.5 → 0.2.6

package/dist/hosts/next/loaders/identity-loader.cjs

@@ -15898,6 +15898,9 @@ var init_componentInstrumentation = __esm({
 function stripModuleExtension(value) {
   return value.replace(/\.(?:d\.)?[cm]?[jt]sx?$/, "");
 }
+function componentIdentity(moduleSource, exportName) {
+  return `${stripModuleExtension(moduleSource)}#${exportName}`;
+}
 function relativePath(id, root) {
   if (root) {
     const rootPrefix = root.endsWith("/") ? root : `${root}/`;
@@ -15917,6 +15920,15 @@ var init_sourcePaths = __esm({
   }
 });
 
+// src/compiler/identityAttributes.ts
+var IDENTITY_ATTRIBUTES;
+var init_identityAttributes = __esm({
+  "src/compiler/identityAttributes.ts"() {
+    "use strict";
+    IDENTITY_ATTRIBUTES = ["data-cid", "data-src", "data-cprops"];
+  }
+});
+
 // src/compiler/reactIdentity.ts
 function isComponentName(name) {
   return /^[A-Z]/.test(name);
@@ -16072,7 +16084,7 @@ function walk(node, parent, scopeStack, ms, relPath, options, state, allowCompon
     scopeStack.pop();
     return;
   }
-  if (node.type === "JSXElement" && options.instrumentComponents && allowComponentWrapping) {
+  if (node.type === "JSXElement" && options.instrumentComponents) {
     const opening = node.openingElement;
     const openingName = opening?.name;
     const componentName = elementName(openingName);
@@ -16081,8 +16093,8 @@ function walk(node, parent, scopeStack, ms, relPath, options, state, allowCompon
     const loc = openingName?.loc;
     const line = loc?.start?.line;
     const column = loc?.start?.column;
-    if (componentName && (isComponentName(componentName) || componentName.includes(".")) && state.componentPolicy.canWrap(componentName) && typeof start === "number" && typeof end === "number" && typeof line === "number" && typeof column === "number") {
-      const attrs = opening?.attributes ?? [];
+    const attrs = opening?.attributes ?? [];
+    if (componentName && (isComponentName(componentName) || componentName.includes(".")) && typeof line === "number" && typeof column === "number") {
       const meta = {
         callsiteId: `${relPath}:${line}:${column + 1}`,
         componentId: state.componentPolicy.componentId(componentName) ?? componentIdFor(componentName, relPath, state.componentPolicy.bindings),
@@ -16092,14 +16104,19 @@ function walk(node, parent, scopeStack, ms, relPath, options, state, allowCompon
         column: column + 1,
         authoredProps: authoredPropKinds(attrs, node.children ?? [])
       };
-      const needsExpression = parent?.type === "JSXElement" || parent?.type === "JSXFragment";
-      ms.appendRight(
-        start,
-        `${needsExpression ? "{" : ""}__nudgeUiInstrumentComponent(`
-      );
-      ms.appendRight(end, `, ${JSON.stringify(meta)})${needsExpression ? "}" : ""}`);
-      state.changed = true;
-      state.instrumentedComponents = true;
+      if (allowComponentWrapping && state.componentPolicy.canWrap(componentName) && typeof start === "number" && typeof end === "number") {
+        const needsExpression = parent?.type === "JSXElement" || parent?.type === "JSXFragment";
+        ms.appendRight(
+          start,
+          `${needsExpression ? "{" : ""}__nudgeUiInstrumentComponent(`
+        );
+        ms.appendRight(end, `, ${JSON.stringify(meta)})${needsExpression ? "}" : ""}`);
+        state.changed = true;
+        state.instrumentedComponents = true;
+      } else if (!hasAttr(attrs, "data-src")) {
+        state.registeredCallsites.push(meta);
+        state.changed = true;
+      }
     }
   }
   if (node.type === "JSXOpeningElement") {
@@ -16143,24 +16160,31 @@ function injectIdentity(code, id, root, options = {}) {
   const state = {
     changed: false,
     instrumentedComponents: false,
-    componentPolicy: createComponentInstrumentationPolicy(ast, options)
+    componentPolicy: createComponentInstrumentationPolicy(ast, options),
+    registeredCallsites: []
   };
   walk(ast, null, [], ms, relPath, options, state, true);
   if (!state.changed) return null;
-  if (state.instrumentedComponents) {
-    const runtimeModule = options.componentRuntimeModule ?? DEFAULT_COMPONENT_RUNTIME_MODULE;
-    ms.prepend(
-      `import { instrumentReactComponent as __nudgeUiInstrumentComponent } from ${JSON.stringify(runtimeModule)};
-`
-    );
-  }
+  const prelude = componentRuntimePrelude(
+    options.componentRuntimeModule ?? DEFAULT_COMPONENT_RUNTIME_MODULE,
+    state
+  );
+  if (prelude) ms.prepend(prelude);
   return {
     code: ms.toString(),
-    map: ms.generateMap({ source: id, hires: true })
+    map: ms.generateMap({ source: id, hires: true }),
+    prelude
   };
 }
-function injectDataCid(code, id, root) {
-  return injectIdentity(code, id, root);
+function componentRuntimePrelude(runtimeModule, state) {
+  const bindings = [
+    ...state.instrumentedComponents ? ["instrumentReactComponent as __nudgeUiInstrumentComponent"] : [],
+    ...state.registeredCallsites.length > 0 ? ["registerReactCallsites as __nudgeUiRegisterCallsites"] : []
+  ];
+  if (bindings.length === 0) return null;
+  const registration = state.registeredCallsites.length > 0 ? ` __nudgeUiRegisterCallsites(${JSON.stringify(state.registeredCallsites)});` : "";
+  return `import { ${bindings.join(", ")} } from ${JSON.stringify(runtimeModule)};${registration}
+`;
 }
 var import_node_path2, DEFAULT_COMPONENT_RUNTIME_MODULE, PARSEABLE_EXT, EXPRESSION_SCOPE_TYPES, ALL_SCOPE_TYPES, IDENTITY_ATTRS;
 var init_reactIdentity = __esm({
@@ -16171,6 +16195,7 @@ var init_reactIdentity = __esm({
     init_ast();
     init_componentInstrumentation();
     init_sourcePaths();
+    init_identityAttributes();
     DEFAULT_COMPONENT_RUNTIME_MODULE = "nudge-ui/internal/component-runtime";
     PARSEABLE_EXT = /\.(tsx|jsx)$/;
     EXPRESSION_SCOPE_TYPES = /* @__PURE__ */ new Set([
@@ -16183,7 +16208,7 @@ var init_reactIdentity = __esm({
       "ClassDeclaration",
       ...EXPRESSION_SCOPE_TYPES
     ]);
-    IDENTITY_ATTRS = /* @__PURE__ */ new Set(["data-cid", "data-src", "data-cprops"]);
+    IDENTITY_ATTRS = new Set(IDENTITY_ATTRIBUTES);
   }
 });
 
@@ -16210,10 +16235,7 @@ function transformNextModuleSource(source, moduleId, options = {}) {
   let map = identity ? identity.map : null;
   let layoutInstrumented = false;
   if (identity && clientComponent) {
-    code = relocatePrependedRuntimeImport(
-      code,
-      options.componentRuntimeModule ?? NEXT_COMPONENT_RUNTIME_MODULE
-    );
+    code = relocatePrependedRuntimePrelude(code, identity.prelude);
   }
   if (isAppRootLayoutPath(normalized)) {
     const mounted = instrumentRootLayout(code);
@@ -16226,13 +16248,11 @@ function transformNextModuleSource(source, moduleId, options = {}) {
   if (!identity && !layoutInstrumented) return null;
   return { code, map, clientComponent, layoutInstrumented };
 }
-function relocatePrependedRuntimeImport(code, runtimeModule) {
-  const runtimeImport = `import { instrumentReactComponent as __nudgeUiInstrumentComponent } from ${JSON.stringify(runtimeModule)};
-`;
-  if (!code.startsWith(runtimeImport)) return code;
-  const rest = code.slice(runtimeImport.length);
+function relocatePrependedRuntimePrelude(code, prelude) {
+  if (!prelude || !code.startsWith(prelude)) return code;
+  const rest = code.slice(prelude.length);
   const insertAt = directivePrologueEnd(rest);
-  return rest.slice(0, insertAt) + runtimeImport + rest.slice(insertAt);
+  return rest.slice(0, insertAt) + prelude + rest.slice(insertAt);
 }
 function isPagesRouterModule(normalizedId, options) {
   const pagesDir = (options.pagesDir ?? "pages").split("\\").join("/").replace(/^\/+|\/+$/g, "");
@@ -16657,7 +16677,6 @@ function createTracer(adapter, options) {
     return request(reference.source, reference.exportName, module2.moduleId, state);
   }
   return {
-    /** Resolve one authored import to the protocol of the component it names. */
     request: (source, exportName, importer) => request(source, exportName, importer, { visited: /* @__PURE__ */ new Set(), depth: 0 })
   };
 }
@@ -16696,7 +16715,7 @@ function resolvedProtocol(source, exportName, protocol) {
     resolved: true,
     protocol: {
       ...protocol,
-      componentId: `${stripModuleExtension(source)}#${exportName}`
+      componentId: componentIdentity(source, exportName)
     }
   };
 }
@@ -16927,7 +16946,7 @@ function componentContract(name, propsType, declarations, file) {
   const props = membersForType(propsType, declarations).map(propertyContract).filter((prop) => prop !== null);
   if (props.length === 0) return null;
   return {
-    componentId: `${file.replace(/\.(?:d\.)?[cm]?[jt]sx?$/, "")}#${name}`,
+    componentId: componentIdentity(file, name),
     name,
     file,
     props,
@@ -16989,6 +17008,7 @@ var init_componentContracts = __esm({
   "src/compiler/componentContracts.ts"() {
     "use strict";
     import_parser3 = __toESM(require_lib(), 1);
+    init_sourcePaths();
     STRUCTURAL_TEXT_PROPS = /* @__PURE__ */ new Set([
       "id",
       "className",
@@ -227745,12 +227765,16 @@ Additional information: BADCLIENT: Bad error code, ${badCode} not found in range
 function isBareModuleSpecifier(value) {
   return value !== "" && !value.startsWith(".") && !value.startsWith("/") && !value.startsWith("\0") && !value.startsWith("virtual:");
 }
-function rootJsxIdentifier(tagName) {
+function jsxTagReference(tagName) {
+  const members = [];
   let current = tagName;
-  while (import_typescript.default.isPropertyAccessExpression(current)) current = current.expression;
-  return import_typescript.default.isIdentifier(current) ? current.text : null;
+  while (import_typescript.default.isPropertyAccessExpression(current)) {
+    members.unshift(current.name.text);
+    current = current.expression;
+  }
+  return import_typescript.default.isIdentifier(current) ? { binding: current.text, member: members[0] ?? null } : null;
 }
-function collectPackageComponentModules(code, fileName) {
+function collectPackageComponentImports(code, fileName) {
   const source = import_typescript.default.createSourceFile(
     fileName,
     code,
@@ -227758,32 +227782,43 @@ function collectPackageComponentModules(code, fileName) {
     true,
     fileName.endsWith("x") ? import_typescript.default.ScriptKind.TSX : import_typescript.default.ScriptKind.JSX
   );
-  const modulesByBinding = /* @__PURE__ */ new Map();
+  const bindings = /* @__PURE__ */ new Map();
   for (const statement of source.statements) {
     if (!import_typescript.default.isImportDeclaration(statement) || !import_typescript.default.isStringLiteral(statement.moduleSpecifier) || !isBareModuleSpecifier(statement.moduleSpecifier.text)) continue;
     const moduleSpecifier = statement.moduleSpecifier.text;
     const clause = statement.importClause;
-    if (clause?.name) modulesByBinding.set(clause.name.text, moduleSpecifier);
-    const bindings = clause?.namedBindings;
-    if (bindings && import_typescript.default.isNamespaceImport(bindings)) {
-      modulesByBinding.set(bindings.name.text, moduleSpecifier);
-    } else if (bindings && import_typescript.default.isNamedImports(bindings)) {
-      for (const element of bindings.elements) {
-        if (!element.isTypeOnly) modulesByBinding.set(element.name.text, moduleSpecifier);
+    if (!clause || clause.isTypeOnly) continue;
+    if (clause.name) bindings.set(clause.name.text, { moduleSpecifier, exportName: "default" });
+    const named = clause.namedBindings;
+    if (named && import_typescript.default.isNamespaceImport(named)) {
+      bindings.set(named.name.text, { moduleSpecifier, exportName: null });
+    } else if (named && import_typescript.default.isNamedImports(named)) {
+      for (const element of named.elements) {
+        if (element.isTypeOnly) continue;
+        bindings.set(element.name.text, {
+          moduleSpecifier,
+          exportName: (element.propertyName ?? element.name).text
+        });
       }
     }
   }
-  const modules = /* @__PURE__ */ new Set();
+  const imports = /* @__PURE__ */ new Map();
   const visit2 = (node) => {
     if (import_typescript.default.isJsxOpeningElement(node) || import_typescript.default.isJsxSelfClosingElement(node)) {
-      const binding = rootJsxIdentifier(node.tagName);
-      const moduleSpecifier = binding ? modulesByBinding.get(binding) : void 0;
-      if (moduleSpecifier) modules.add(moduleSpecifier);
+      const reference = jsxTagReference(node.tagName);
+      const binding = reference ? bindings.get(reference.binding) : void 0;
+      const exportName = binding?.exportName ?? reference?.member ?? null;
+      if (binding && exportName) {
+        imports.set(`${binding.moduleSpecifier}#${exportName}`, {
+          moduleSpecifier: binding.moduleSpecifier,
+          exportName
+        });
+      }
     }
     import_typescript.default.forEachChild(node, visit2);
   };
   visit2(source);
-  return [...modules].sort();
+  return [...imports].sort(([left], [right]) => left.localeCompare(right)).map(([, value]) => value);
 }
 function symbolName(symbol) {
   if (!symbol) return null;
@@ -227921,7 +227956,7 @@ function componentContract2(exportName, symbol, checker, packageRoot, moduleSpec
   const props = packageDeclaredSymbols(propsType, checker, packageRoot).map((prop) => propContract(prop, checker, declaration)).filter((prop) => prop !== null);
   if (props.length === 0) return null;
   return {
-    componentId: `${moduleSpecifier}#${exportName}`,
+    componentId: componentIdentity(moduleSpecifier, exportName),
     name: exportName,
     file: moduleSpecifier,
     props,
@@ -227929,17 +227964,26 @@ function componentContract2(exportName, symbol, checker, packageRoot, moduleSpec
   };
 }
 function extractPackageComponentContracts(context) {
-  return extractPackageComponentContractCatalog({
-    hostFile: context.hostFile,
-    moduleSpecifiers: [context.moduleSpecifier],
-    compilerOptions: context.compilerOptions
-  });
+  return extractContracts(
+    context.hostFile,
+    /* @__PURE__ */ new Map([[context.moduleSpecifier, null]]),
+    context.compilerOptions
+  );
 }
 function extractPackageComponentContractCatalog(context) {
-  const compilerOptions = { ...DEFAULT_COMPILER_OPTIONS, ...context.compilerOptions };
-  const moduleSpecifiers2 = [...new Set(context.moduleSpecifiers)].sort();
+  const exportsByModule = /* @__PURE__ */ new Map();
+  for (const { moduleSpecifier, exportName } of context.imports) {
+    const exportNames = exportsByModule.get(moduleSpecifier) ?? /* @__PURE__ */ new Set();
+    exportNames.add(exportName);
+    exportsByModule.set(moduleSpecifier, exportNames);
+  }
+  return extractContracts(context.hostFile, exportsByModule, context.compilerOptions);
+}
+function extractContracts(hostFile, exportsByModule, overrides) {
+  const compilerOptions = { ...DEFAULT_COMPILER_OPTIONS, ...overrides };
+  const moduleSpecifiers2 = [...exportsByModule.keys()].sort();
   if (moduleSpecifiers2.length === 0) return [];
-  const virtualFile = (0, import_node_path4.resolve)((0, import_node_path4.dirname)(context.hostFile), "__nudge_ui_package_contracts__.tsx");
+  const virtualFile = (0, import_node_path4.resolve)((0, import_node_path4.dirname)(hostFile), "__nudge_ui_package_contracts__.tsx");
   const virtualSource = moduleSpecifiers2.map((moduleSpecifier, index) => `import * as __nudgeUiPackage${index} from ${JSON.stringify(moduleSpecifier)};`).join("\n");
   const host = import_typescript.default.createCompilerHost(compilerOptions);
   const getSourceFile = host.getSourceFile.bind(host);
@@ -227965,7 +228009,9 @@ function extractPackageComponentContractCatalog(context) {
     const moduleSymbol = checker.getSymbolAtLocation(sourceFile);
     if (!moduleSymbol) return [];
     const packageRoot = packageRootFor(resolution.resolvedFileName, moduleSpecifier);
-    return checker.getExportsOfModule(moduleSymbol).map((symbol) => {
+    const exportNames = exportsByModule.get(moduleSpecifier);
+    const symbols = exportNames ? [...exportNames].sort().flatMap((exportName) => checker.tryGetMemberInModuleExports(exportName, moduleSymbol) ?? []) : checker.getExportsOfModule(moduleSymbol);
+    return symbols.map((symbol) => {
       const exportName = symbolName(symbol);
       return exportName ? componentContract2(exportName, symbol, checker, packageRoot, moduleSpecifier) : null;
     }).filter((contract) => contract !== null);
@@ -227977,6 +228023,7 @@ var init_packageComponentContracts = __esm({
     "use strict";
     import_node_path4 = require("node:path");
     import_typescript = __toESM(require_typescript(), 1);
+    init_sourcePaths();
     DEFAULT_COMPILER_OPTIONS = {
       allowJs: false,
       jsx: import_typescript.default.JsxEmit.ReactJSX,
@@ -228004,7 +228051,7 @@ var init_packageComponentContracts = __esm({
 var compiler_exports = {};
 __export(compiler_exports, {
   DEFAULT_COMPONENT_RUNTIME_MODULE: () => DEFAULT_COMPONENT_RUNTIME_MODULE,
-  collectPackageComponentModules: () => collectPackageComponentModules,
+  collectPackageComponentImports: () => collectPackageComponentImports,
   createComponentInstrumentationPolicy: () => createComponentInstrumentationPolicy,
   defaultReactComponentProtocols: () => defaultReactComponentProtocols,
   extractComponentContracts: () => extractComponentContracts,
@@ -228012,7 +228059,6 @@ __export(compiler_exports, {
   extractPackageComponentContracts: () => extractPackageComponentContracts,
   formatComponentPolicyWarning: () => formatComponentPolicyWarning,
   groupComponentPolicyDiagnostics: () => groupComponentPolicyDiagnostics,
-  injectDataCid: () => injectDataCid,
   injectIdentity: () => injectIdentity,
   mergeComponentModuleProtocols: () => mergeComponentModuleProtocols,
   relativePath: () => relativePath,