refactor(shared): leave enforcement to follow-up

RomneyDa · RomneyDa · commit 0782a9dc6363 · 2026-07-02T20:40:24.000-07:00
diff --git a/scripts/check-dynamic-import-warts.mjs b/scripts/check-dynamic-import-warts.mjs
@@ -74,41 +74,6 @@ function readDeclarationName(node) {
   return null;
 }
 
-function unwrapExpression(node) {
-  let current = node;
-  while (
-    ts.isParenthesizedExpression(current) ||
-    ts.isAsExpression(current) ||
-    ts.isTypeAssertionExpression(current) ||
-    ts.isSatisfiesExpression(current)
-  ) {
-    current = current.expression;
-  }
-  return current;
-}
-
-function isCanonicalLazyLoaderExpression(node) {
-  const expression = unwrapExpression(node);
-  return (
-    ts.isCallExpression(expression) &&
-    ts.isIdentifier(expression.expression) &&
-    expression.expression.text.startsWith("createLazy")
-  );
-}
-
-function containsDynamicImport(node) {
-  let found = false;
-  const visit = (current) => {
-    if (ts.isCallExpression(current) && current.expression.kind === ts.SyntaxKind.ImportKeyword) {
-      found = true;
-      return;
-    }
-    ts.forEachChild(current, visit);
-  };
-  visit(node);
-  return found;
-}
-
 function isIgnoredTestHelperContent(content) {
   return /\bfrom\s+["']vitest["']/.test(content) || /\bfrom\s+["']@vitest\//.test(content);
 }
@@ -134,7 +99,6 @@ export function findDynamicImportAdvisories(content, fileName = "source.ts") {
   const staticRuntimeImports = new Map();
   const dynamicImports = new Map();
   const directExecuteImports = [];
-  const manualMemoizers = [];
   const declarationStack = [];
 
   const addLine = (map, specifier, line) => {
@@ -184,19 +148,6 @@ export function findDynamicImportAdvisories(content, fileName = "source.ts") {
       }
     }
 
-    if (
-      ts.isBinaryExpression(node) &&
-      node.operatorToken.kind === ts.SyntaxKind.QuestionQuestionEqualsToken &&
-      containsDynamicImport(node.right) &&
-      !isCanonicalLazyLoaderExpression(node.right)
-    ) {
-      manualMemoizers.push({
-        line: toLine(sourceFile, node),
-        reason:
-          "hand-written dynamic import memoizer; use createLazyPromise or createLazyRuntimeModule",
-      });
-    }
-
     ts.forEachChild(node, visit);
     if (declarationName) {
       declarationStack.pop();
@@ -205,7 +156,7 @@ export function findDynamicImportAdvisories(content, fileName = "source.ts") {
 
   visit(sourceFile);
 
-  const advisories = [...directExecuteImports, ...manualMemoizers];
+  const advisories = [...directExecuteImports];
   for (const [specifier, dynamicLines] of dynamicImports) {
     const staticLines = staticRuntimeImports.get(specifier);
     if (staticLines?.length) {
@@ -256,7 +207,6 @@ export async function collectDynamicImportAdvisories(options = {}) {
  */
 export async function main(argv = process.argv.slice(2)) {
   const fail = argv.includes("--fail");
-  const failManualMemoizers = argv.includes("--fail-manual-memoizers");
   const json = argv.includes("--json");
   const advisories = await collectDynamicImportAdvisories();
 
@@ -275,14 +225,6 @@ export async function main(argv = process.argv.slice(2)) {
   if (fail && advisories.length > 0) {
     process.exit(1);
   }
-  if (
-    failManualMemoizers &&
-    advisories.some((advisory) =>
-      advisory.reason.startsWith("hand-written dynamic import memoizer"),
-    )
-  ) {
-    process.exit(1);
-  }
 }
 
 runAsScript(import.meta.url, main);
diff --git a/test/scripts/check-dynamic-import-warts.test.ts b/test/scripts/check-dynamic-import-warts.test.ts
@@ -37,10 +37,12 @@ describe("check-dynamic-import-warts", () => {
       }
       export { run } from "./runtime.js";
     `;
-    expect(findDynamicImportAdvisories(source)).toContainEqual({
-      line: 4,
-      reason: 'runtime static + dynamic import of "./runtime.js" (static line 7)',
-    });
+    expect(findDynamicImportAdvisories(source)).toEqual([
+      {
+        line: 4,
+        reason: 'runtime static + dynamic import of "./runtime.js" (static line 7)',
+      },
+    ]);
   });
 
   it("ignores type-only static re-exports", () => {
@@ -72,10 +74,12 @@ describe("check-dynamic-import-warts", () => {
       }
       export { type Runtime, createRuntime } from "./runtime.js";
     `;
-    expect(findDynamicImportAdvisories(source)).toContainEqual({
-      line: 4,
-      reason: 'runtime static + dynamic import of "./runtime.js" (static line 7)',
-    });
+    expect(findDynamicImportAdvisories(source)).toEqual([
+      {
+        line: 4,
+        reason: 'runtime static + dynamic import of "./runtime.js" (static line 7)',
+      },
+    ]);
   });
 
   it("ignores local export declarations without module specifiers", () => {
@@ -106,43 +110,14 @@ describe("check-dynamic-import-warts", () => {
     ]);
   });
 
-  it("flags hand-written dynamic import memoizers", () => {
+  it("ignores cached loader patterns", () => {
     const source = `
       let runtimePromise: Promise<typeof import("./runtime.js")> | undefined;
       function loadRuntime() {
         runtimePromise ??= import("./runtime.js");
         return runtimePromise;
       }
     `;
-    expect(findDynamicImportAdvisories(source)).toContainEqual({
-      line: 4,
-      reason:
-        "hand-written dynamic import memoizer; use createLazyPromise or createLazyRuntimeModule",
-    });
-  });
-
-  it("flags transformed and multi-import memoizers", () => {
-    const source = `
-      let runtimePromise: Promise<unknown> | undefined;
-      function loadRuntime() {
-        runtimePromise ??= Promise.all([
-          import("./one.js"),
-          import("./two.js"),
-        ]).then(([one, two]) => ({ one, two }));
-        return runtimePromise;
-      }
-    `;
-    expect(findDynamicImportAdvisories(source)).toContainEqual({
-      line: 4,
-      reason:
-        "hand-written dynamic import memoizer; use createLazyPromise or createLazyRuntimeModule",
-    });
-  });
-
-  it("allows canonical lazy loader assignment", () => {
-    const source = `
-      state.loader ??= createLazyImportLoader(() => import("./runtime.js"));
-    `;
     expect(findDynamicImportAdvisories(source)).toStrictEqual([]);
   });
 
@@ -167,7 +142,11 @@ describe("check-dynamic-import-warts", () => {
 
   it("allows execute paths that call cached loaders", () => {
     const source = `
-      const loadRuntime = createLazyRuntimeModule(() => import("./runtime.js"));
+      let runtimePromise: Promise<typeof import("./runtime.js")> | undefined;
+      function loadRuntime() {
+        runtimePromise ??= import("./runtime.js");
+        return runtimePromise;
+      }
       export function createTool() {
         return {
           execute: async () => await loadRuntime(),
