refactor(app): move shared lib code into package app

Author: skulidropek

packages/app/eslint.config.mts

@@ -15,7 +15,7 @@ import simpleImportSort from "eslint-plugin-simple-import-sort";
 import sortDestructureKeys from "eslint-plugin-sort-destructure-keys";
 import globals from "globals";
 import eslintCommentsConfigs from "@eslint-community/eslint-plugin-eslint-comments/configs";
-import { appLegacyLibImportAllowlist, noLibImportsRule } from "./eslint/no-lib-imports.mjs";
+import { noLibImportsRule } from "./eslint/no-lib-imports.mjs";
 
 const codegenPlugin = fixupPluginRules(
 	codegen as unknown as Parameters<typeof fixupPluginRules>[0],
@@ -73,9 +73,7 @@ export default defineConfig(
 	rules: {
 		...sonarjs.configs.recommended.rules,
 		...unicorn.configs.recommended.rules,
-		"local/no-lib-imports": ["error", {
-			allowInFiles: appLegacyLibImportAllowlist,
-		}],
+		"local/no-lib-imports": "error",
 		"no-restricted-imports": ["error", {
 			paths: [
 				{

packages/app/eslint.effect-ts-check.config.mjs

@@ -10,7 +10,7 @@
 import eslintComments from "@eslint-community/eslint-plugin-eslint-comments"
 import globals from "globals"
 import tseslint from "typescript-eslint"
-import { appLegacyLibImportAllowlist, noLibImportsRule } from "./eslint/no-lib-imports.mjs"
+import { noLibImportsRule } from "./eslint/no-lib-imports.mjs"
 
 const restrictedImports = [
   {
@@ -152,9 +152,7 @@ export default tseslint.config(
       local: { rules: { "no-lib-imports": noLibImportsRule } }
     },
     rules: {
-      "local/no-lib-imports": ["error", {
-        allowInFiles: appLegacyLibImportAllowlist
-      }],
+      "local/no-lib-imports": "error",
       "no-console": "error",
       "no-restricted-imports": ["error", {
         paths: restrictedImports,

packages/app/eslint/no-lib-imports.mjs

@@ -2,97 +2,37 @@
 
 const bannedPackageName = "@effect-template/lib"
 
-/** @type {ReadonlyArray<string>} */
-export const appLegacyLibImportAllowlist = [
-  "src/app/program.ts",
-  "src/docker-git/cli/input.ts",
-  "src/docker-git/cli/parser-apply.ts",
-  "src/docker-git/cli/parser-attach.ts",
-  "src/docker-git/cli/parser-auth.ts",
-  "src/docker-git/cli/parser-clone.ts",
-  "src/docker-git/cli/parser-create.ts",
-  "src/docker-git/cli/parser-mcp-playwright.ts",
-  "src/docker-git/cli/parser-options.ts",
-  "src/docker-git/cli/parser-panes.ts",
-  "src/docker-git/cli/parser-scrap.ts",
-  "src/docker-git/cli/parser-session-gists.ts",
-  "src/docker-git/cli/parser-sessions.ts",
-  "src/docker-git/cli/parser-shared.ts",
-  "src/docker-git/cli/parser-state.ts",
-  "src/docker-git/cli/parser.ts",
-  "src/docker-git/cli/read-command.ts",
-  "src/docker-git/cli/usage.ts",
-  "src/docker-git/menu-actions.ts",
-  "src/docker-git/menu-auth-data.ts",
-  "src/docker-git/menu-auth-effects.ts",
-  "src/docker-git/menu-auth-helpers.ts",
-  "src/docker-git/menu-auth-snapshot-builder.ts",
-  "src/docker-git/menu-auth.ts",
-  "src/docker-git/menu-create.ts",
-  "src/docker-git/menu-labeled-env.ts",
-  "src/docker-git/menu-menu.ts",
-  "src/docker-git/menu-project-auth-data.ts",
-  "src/docker-git/menu-project-auth-flows.ts",
-  "src/docker-git/menu-project-auth.ts",
-  "src/docker-git/menu-render-select.ts",
-  "src/docker-git/menu-render.ts",
-  "src/docker-git/menu-select-actions.ts",
-  "src/docker-git/menu-select-connect.ts",
-  "src/docker-git/menu-select-load.ts",
-  "src/docker-git/menu-select-order.ts",
-  "src/docker-git/menu-select-runtime.ts",
-  "src/docker-git/menu-select-view.ts",
-  "src/docker-git/menu-startup.ts",
-  "src/docker-git/menu-types.ts",
-  "src/docker-git/menu.ts",
-  "src/docker-git/program.ts",
-  "src/docker-git/tmux.ts",
-  "tests/docker-git/entrypoint-auth.test.ts",
-  "tests/docker-git/fixtures/project-item.ts",
-  "tests/docker-git/menu-select-connect.test.ts",
-  "tests/docker-git/parser-helpers.ts",
-  "tests/docker-git/parser.test.ts"
-]
-
-/** @param {string} value */
-const normalizePath = (value) => value.replaceAll("\\", "/")
-
 /** @param {string} value */
 const isDirectLibImport = (value) =>
   value === bannedPackageName || value.startsWith(`${bannedPackageName}/`)
 
-/**
- * @param {string} filename
- * @param {ReadonlyArray<string>} allowInFiles
- */
-const isAllowlistedFile = (filename, allowInFiles) => {
-  const normalized = normalizePath(filename)
-  return allowInFiles.some((entry) => normalized === entry || normalized.endsWith(`/${entry}`))
-}
-
 /** @param {(import("eslint").JSSyntaxElement & { readonly value?: unknown }) | null | undefined} source */
-const readSourceText = (source) =>
-  source && source.type === "Literal" && typeof source.value === "string"
-    ? source.value
-    : null
+const readSourceText = (source) => {
+  if (source == null) {
+    return null
+  }
+
+  if (source.type === "Literal" && typeof source.value === "string") {
+    return source.value
+  }
+
+  if (
+    source.type === "TemplateLiteral" &&
+    source.expressions.length === 0 &&
+    source.quasis.length === 1
+  ) {
+    const [quasi] = source.quasis
+    return typeof quasi?.value.cooked === "string" ? quasi.value.cooked : null
+  }
+
+  return null
+}
 
 /**
  * @param {import("eslint").Rule.RuleContext} context
  * @returns {import("eslint").Rule.RuleListener}
  */
 const createRuleListener = (context) => {
-  const [options = {}] = context.options
-  const allowInFiles = Array.isArray(options.allowInFiles)
-    ? options.allowInFiles.map(
-        /** @param {unknown} value */ (value) => normalizePath(String(value))
-      )
-    : []
-  const filename = typeof context.filename === "string" ? context.filename : ""
-
-  if (isAllowlistedFile(filename, allowInFiles)) {
-    return {}
-  }
-
   /** @param {(import("eslint").JSSyntaxElement & { readonly value?: unknown }) | null | undefined} source */
   const checkSource = (source) => {
     if (source == null) {
@@ -112,6 +52,23 @@ const createRuleListener = (context) => {
   }
 
   return {
+    /** @param {{ readonly callee?: import("eslint").JSSyntaxElement | null | undefined, readonly arguments?: ReadonlyArray<import("eslint").JSSyntaxElement | import("eslint").SpreadElement> | null | undefined }} node */
+    CallExpression(node) {
+      if (
+        node.callee?.type !== "Identifier" ||
+        node.callee.name !== "require" ||
+        !Array.isArray(node.arguments)
+      ) {
+        return
+      }
+
+      const [firstArgument] = node.arguments
+      if (firstArgument?.type === "SpreadElement") {
+        return
+      }
+
+      checkSource(firstArgument)
+    },
     /** @param {{ readonly source?: (import("eslint").JSSyntaxElement & { readonly value?: unknown }) | null | undefined }} node */
     ExportAllDeclaration(node) {
       checkSource(node.source)
@@ -131,6 +88,10 @@ const createRuleListener = (context) => {
     /** @param {{ readonly source?: (import("eslint").JSSyntaxElement & { readonly value?: unknown }) | null | undefined, readonly argument?: (import("eslint").JSSyntaxElement & { readonly value?: unknown }) | null | undefined }} node */
     TSImportType(node) {
       checkSource("source" in node ? node.source : node.argument)
+    },
+    /** @param {{ readonly expression?: (import("eslint").JSSyntaxElement & { readonly value?: unknown }) | null | undefined }} node */
+    TSExternalModuleReference(node) {
+      checkSource(node.expression)
     }
   }
 }
@@ -140,23 +101,13 @@ export const noLibImportsRule = {
   meta: {
     type: "problem",
     docs: {
-      description: "forbid direct imports from @effect-template/lib inside package/app"
+      description:
+        "forbid direct imports, re-exports, and require calls from @effect-template/lib inside package/app"
     },
-    schema: [
-      {
-        type: "object",
-        properties: {
-          allowInFiles: {
-            type: "array",
-            items: { type: "string" }
-          }
-        },
-        additionalProperties: false
-      }
-    ],
+    schema: [],
     messages: {
       noLibImport:
-        "Direct import '{{source}}' from @effect-template/lib is forbidden in package/app. Use the API client or a local app adapter instead."
+        "Direct import or require '{{source}}' from @effect-template/lib is forbidden in package/app. Use the API client or a local app adapter instead."
     }
   },
   create: createRuleListener

packages/app/src/app/program.ts

@@ -1,4 +1,4 @@
-import { listProjects, readCloneRequest, runDockerGitClone, runDockerGitOpen } from "@effect-template/lib"
+import { listProjects, readCloneRequest, runDockerGitClone, runDockerGitOpen } from "@lib"
 import { Console, Effect, Match, pipe } from "effect"
 
 /**

packages/app/src/docker-git/cli/input.ts

@@ -1,7 +1,7 @@
 import * as Terminal from "@effect/platform/Terminal"
 import { Effect } from "effect"
 
-import { InputCancelledError, InputReadError } from "@effect-template/lib/shell/errors"
+import { InputCancelledError, InputReadError } from "@lib/shell/errors"
 
 const normalizeMessage = (error: Error): string => error.message
 

packages/app/src/docker-git/cli/parser-apply.ts

@@ -1,7 +1,7 @@
 import { Either } from "effect"
 
-import { type ApplyCommand, type ParseError } from "@effect-template/lib/core/domain"
-import { normalizeCpuLimit, normalizeRamLimit } from "@effect-template/lib/core/resource-limits"
+import { type ApplyCommand, type ParseError } from "@lib/core/domain"
+import { normalizeCpuLimit, normalizeRamLimit } from "@lib/core/resource-limits"
 
 import { parseProjectDirWithOptions } from "./parser-shared.js"
 

packages/app/src/docker-git/cli/parser-attach.ts

@@ -1,6 +1,6 @@
 import { Either } from "effect"
 
-import { type AttachCommand, type ParseError } from "@effect-template/lib/core/domain"
+import { type AttachCommand, type ParseError } from "@lib/core/domain"
 
 import { parseProjectDirArgs } from "./parser-shared.js"
 

packages/app/src/docker-git/cli/parser-auth.ts

@@ -1,7 +1,7 @@
 import { Either, Match } from "effect"
 
-import type { RawOptions } from "@effect-template/lib/core/command-options"
-import { type AuthCommand, type Command, type ParseError } from "@effect-template/lib/core/domain"
+import type { RawOptions } from "@lib/core/command-options"
+import { type AuthCommand, type Command, type ParseError } from "@lib/core/domain"
 
 import { parseRawOptions } from "./parser-options.js"
 

packages/app/src/docker-git/cli/parser-clone.ts

@@ -1,8 +1,8 @@
 import { Either } from "effect"
 
-import { buildCreateCommand, nonEmpty } from "@effect-template/lib/core/command-builders"
-import type { RawOptions } from "@effect-template/lib/core/command-options"
-import { type Command, type ParseError, resolveRepoInput } from "@effect-template/lib/core/domain"
+import { buildCreateCommand, nonEmpty } from "@lib/core/command-builders"
+import type { RawOptions } from "@lib/core/command-options"
+import { type Command, type ParseError, resolveRepoInput } from "@lib/core/domain"
 
 import { parseRawOptions } from "./parser-options.js"
 import { resolveWorkspaceRepoPath, splitPositionalRepo } from "./parser-shared.js"

packages/app/src/docker-git/cli/parser-create.ts

@@ -1,3 +1,3 @@
-export { buildCreateCommand, nonEmpty } from "@effect-template/lib/core/command-builders"
-export type { RawOptions } from "@effect-template/lib/core/command-options"
-export type { CreateCommand, ParseError } from "@effect-template/lib/core/domain"
+export { buildCreateCommand, nonEmpty } from "@lib/core/command-builders"
+export type { RawOptions } from "@lib/core/command-options"
+export type { CreateCommand, ParseError } from "@lib/core/domain"