attio 0.0.1-experimental.20240916.3 → 0.0.1-experimental.20240917

package/lib/build/client/generate-client-entry.js

@@ -3,14 +3,14 @@ import { glob } from "glob";
 import path from "path";
 const ROUTE_FILE_EXTENSIONS = ["tsx", "jsx", "ts", "js"];
 const ASSET_FILE_EXTENSIONS = ["png"];
-export async function generateClientEntry({ filePath, appDir, assetsDir, routes, log, }) {
+export async function generateClientEntry({ appDir, appDirAbsolute, assetsDirAbsolute, routes, log, }) {
     log?.(`💥 Found entry point at ${path.resolve(appDir)}`);
     const paths = routes.flatMap((route) => ROUTE_FILE_EXTENSIONS.map((fileExtension) => route + "." + fileExtension));
     const concreteRoutes = (await Promise.all(paths.map(async (path) => {
         try {
             const concretePaths = await glob(path, {
                 nodir: true,
-                cwd: appDir,
+                cwd: appDirAbsolute,
             });
             for (const concretePath of concretePaths) {
                 log?.(`🔎 Found route "${concretePath}"`);
@@ -26,7 +26,7 @@ export async function generateClientEntry({ filePath, appDir, assetsDir, routes,
     }))).flat();
     let assetFiles;
     try {
-        assetFiles = await fs.readdir(assetsDir, { recursive: true });
+        assetFiles = await fs.readdir(assetsDirAbsolute, { recursive: true });
     }
     catch {
         assetFiles = [];
@@ -34,19 +34,19 @@ export async function generateClientEntry({ filePath, appDir, assetsDir, routes,
     const assets = assetFiles
         .filter((relativeAssetPath) => ASSET_FILE_EXTENSIONS.some((extension) => relativeAssetPath.endsWith(extension)))
         .map((relativeAssetPath) => ({
-        path: path.join(assetsDir, relativeAssetPath),
+        path: path.join(assetsDirAbsolute, relativeAssetPath),
         name: relativeAssetPath,
     }));
     return `
 ${concreteRoutes
-        .map((routeAndPath, index) => `import C${index} from ${JSON.stringify(path.relative(filePath, path.join(appDir, routeAndPath.path)))}`)
+        .map((routeAndPath, index) => `import C${index} from ${JSON.stringify(path.join(appDirAbsolute, routeAndPath.path))}`)
         .join("\n")}
 
     const assets = []
 
 ${assets
         .map((asset, index) => `
-import A${index} from ${JSON.stringify(path.relative(filePath, asset.path))};
+import A${index} from ${JSON.stringify(asset.path)};
             
 assets.push({name: ${JSON.stringify(asset.name)}, data: A${index}})
             `)

package/lib/build/server/generate-server-entry.js

@@ -1,15 +1,15 @@
 import { glob } from "glob";
 import path from "path";
 import { getModuleHash } from "../get-module-hash.js";
-export async function generateServerEntry({ appDir, webhooksDir, filePath, log, }) {
+export async function generateServerEntry({ appDirAbsolute, webhooksDirAbsolute, log, }) {
     const [serverFunctionConcretePaths, webhookConcretePaths] = await Promise.all([
         Promise.all([
-            glob("**/*.server.ts", { nodir: true, cwd: appDir }),
-            glob("**/*.server.js", { nodir: true, cwd: appDir }),
+            glob("**/*.server.ts", { nodir: true, cwd: appDirAbsolute }),
+            glob("**/*.server.js", { nodir: true, cwd: appDirAbsolute }),
         ]).then((paths) => paths.flat()),
         Promise.all([
-            glob("**/*.webhook.ts", { nodir: true, cwd: webhooksDir }),
-            glob("**/*.webhook.js", { nodir: true, cwd: webhooksDir }),
+            glob("**/*.webhook.ts", { nodir: true, cwd: webhooksDirAbsolute }),
+            glob("**/*.webhook.js", { nodir: true, cwd: webhooksDirAbsolute }),
         ]).then((paths) => paths.flat()),
     ]);
     const serverFunctionModules = serverFunctionConcretePaths.map((path) => ({
@@ -30,11 +30,11 @@ export async function generateServerEntry({ appDir, webhooksDir, filePath, log,
 
     
         ${serverFunctionModules
-        .map((module) => `modules.set("${module.hash}", () => import(${JSON.stringify(path.relative(filePath, path.join(appDir, module.path)))}))`)
+        .map((module) => `modules.set("${module.hash}", () => import(${JSON.stringify(path.join(appDirAbsolute, module.path))}))`)
         .join("\n")}
 
         ${webhookModules
-        .map((module) => `webhookModules.set("${module.id}", () => import(${JSON.stringify(path.relative(filePath, path.join(webhooksDir, module.path)))}))`)
+        .map((module) => `webhookModules.set("${module.id}", () => import(${JSON.stringify(path.join(webhooksDirAbsolute, module.path))}))`)
         .join("\n")}
 
         var stdin_default;

package/lib/machines/js-machine.js

@@ -32,9 +32,9 @@ export const jsMachine = setup({
                         let lastJS;
                         const updateTempFile = async () => {
                             const js = await generateClientEntry({
-                                filePath: tempFile.path,
                                 appDir,
-                                assetsDir,
+                                appDirAbsolute: path.resolve(appDir),
+                                assetsDirAbsolute: path.resolve(assetsDir),
                                 routes: ROUTES,
                                 log,
                             });
@@ -44,7 +44,6 @@ export const jsMachine = setup({
                             lastJS = js;
                             await fs.writeFile(tempFile.path, js);
                         };
-                        await updateTempFile();
                         const esbuildContext = await esbuild.context({
                             ...createClientBuildConfig({
                                 entryPoint: tempFile.path,
@@ -71,9 +70,8 @@ export const jsMachine = setup({
                         let lastJS;
                         const updateTempFile = async () => {
                             const js = await generateServerEntry({
-                                filePath: tempFile.path,
-                                appDir,
-                                webhooksDir,
+                                appDirAbsolute: path.resolve(appDir),
+                                webhooksDirAbsolute: path.resolve(webhooksDir),
                                 log,
                             });
                             if (js === lastJS) {
@@ -82,7 +80,6 @@ export const jsMachine = setup({
                             lastJS = js;
                             await fs.writeFile(tempFile.path, js);
                         };
-                        await updateTempFile();
                         const esbuildContext = await esbuild.context({
                             ...createServerBuildConfig(tempFile.path),
                             write,

package/lib/templates/javascript/eslint.config.js

@@ -2,6 +2,7 @@ const {FlatCompat} = require("@eslint/eslintrc")
 const js = require("@eslint/js")
 const reactPlugin = require("eslint-plugin-react")
 const reactHooksPlugin = require("eslint-plugin-react-hooks")
+const attio = require("attio/lint")
 
 const compat = new FlatCompat({
     baseDirectory: __dirname,
@@ -25,11 +26,13 @@ module.exports = [
         plugins: {
             "react": reactPlugin,
             "react-hooks": reactHooksPlugin,
+            attio,
         },
         rules: {
             "react/jsx-key": "error",
             "react-hooks/rules-of-hooks": "error",
             "react-hooks/exhaustive-deps": "error",
+            "attio/attio-client-import": "error",
         },
         settings: {
             react: {

package/lib/templates/typescript/eslint.config.js

@@ -4,6 +4,7 @@ const reactPlugin = require("eslint-plugin-react")
 const reactHooksPlugin = require("eslint-plugin-react-hooks")
 const typescriptEslintPlugin = require("@typescript-eslint/eslint-plugin")
 const typescriptParser = require("@typescript-eslint/parser")
+const attio = require("attio/lint")
 
 const compat = new FlatCompat({
     baseDirectory: __dirname,
@@ -31,12 +32,14 @@ module.exports = [
             "react": reactPlugin,
             "react-hooks": reactHooksPlugin,
             "@typescript-eslint": typescriptEslintPlugin,
+            attio,
         },
         rules: {
             "react/jsx-key": "error",
             "react-hooks/rules-of-hooks": "error",
             "react-hooks/exhaustive-deps": "error",
             "@typescript-eslint/no-unused-vars": "error",
+            "attio/attio-client-import": "error",
         },
         settings: {
             react: {

package/lint.cjs

@@ -0,0 +1,37 @@
+module.exports = {
+    rules: {
+        "attio-client-import": {
+            meta: {
+                type: "problem",
+                docs: {
+                    description: 'Disallow imports from "attio/client" in server files',
+                    category: "Possible Errors",
+                    recommended: true,
+                },
+                fixable: null,
+            },
+            create(context) {
+                return {
+                    ImportDeclaration(node) {
+                        if (node.source.value === "attio/client") {
+                            const filename = context.getFilename()
+                            if (filename.endsWith(".server.ts")) {
+                                context.report({
+                                    node,
+                                    message:
+                                        'Imports from "attio/client" are not allowed in .server.ts files',
+                                })
+                            } else if (filename.endsWith(".server.js")) {
+                                context.report({
+                                    node,
+                                    message:
+                                        'Imports from "attio/client" are not allowed in .server.js files',
+                                })
+                            }
+                        }
+                    },
+                }
+            },
+        },
+    },
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "attio",
-  "version": "0.0.1-experimental.20240916.3",
+  "version": "0.0.1-experimental.20240917",
   "bin": "lib/attio.js",
   "type": "module",
   "files": [
@@ -8,7 +8,8 @@
     "attio.js",
     "client.d.ts",
     "server.d.ts",
-    "global.d.ts"
+    "global.d.ts",
+    "lint.cjs"
   ],
   "exports": {
     "./client": {
@@ -19,6 +20,9 @@
     },
     "./server": {
       "types": "./server.d.ts"
+    },
+    "./lint": {
+      "default": "./lint.cjs"
     }
   },
   "dependencies": {