@postxl/generators 1.1.0 → 1.1.1

package/dist/backend-core/template/apps/api/src/e2e.ts

@@ -72,6 +72,7 @@
 import { INestApplication } from '@nestjs/common'
 
 import { getMemoryUsage } from 'apps/api/src/console.logger'
+import { Mutex } from 'async-mutex'
 import express, { Express, Request, Response } from 'express'
 import http, { Server } from 'node:http'
 import { format } from 'node:util'
@@ -159,13 +160,21 @@ const defaultBackendId = zSpecId.parse('default-backend')
 const backends = new Map<SpecId, Backend>()
 const usedPorts = new Set<Port>()
 
+// Mutex to prevent race conditions when allocating ports
+const portAllocationMutex = new Mutex()
+
 async function getNextAvailablePort(): Promise<Port> {
+  const release = await portAllocationMutex.acquire()
   let port: Port = 4000 as Port
-  while (usedPorts.has(port) || !(await checkPortAvailability(port))) {
-    port = (port + 1) as Port
+  try {
+    while (usedPorts.has(port) || !(await checkPortAvailability(port))) {
+      port = (port + 1) as Port
+    }
+    usedPorts.add(port)
+    return port
+  } finally {
+    release()
   }
-  usedPorts.add(port)
-  return port
 }
 
 async function startBackend(spec: SpecId, isDefault: boolean): Promise<Backend_Running> {

package/dist/e2e/e2e.generator.js

@@ -36,8 +36,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generator = exports.generatorId = void 0;
 const path = __importStar(require("node:path"));
 const Generator = __importStar(require("@postxl/generator"));
+const docker_sh_generator_1 = require("./generators/docker-sh.generator");
 const model_test_id_generator_1 = require("./generators/model-test-id.generator");
-const DOCKER_SH_FILENAME = 'docker.sh';
 const PACKAGE_JSON_FILENAME = 'package.json';
 exports.generatorId = Generator.toGeneratorInterfaceId('e2e');
 exports.generator = {
@@ -61,20 +61,7 @@ exports.generator = {
             targetPath: '/e2e',
             filter: (filePath) => !filePath.endsWith(PACKAGE_JSON_FILENAME),
         });
-        await vfs.loadFolder({
-            diskPath: path.resolve(__dirname, './template/scripts'),
-            targetPath: '/scripts',
-            filter: (filePath) => !filePath.endsWith(DOCKER_SH_FILENAME),
-        });
         // Load files with template substitution
-        const dockerShContent = await Generator.generateFromTemplate({
-            file: path.resolve(__dirname, './template/scripts', DOCKER_SH_FILENAME),
-            context: templateContext,
-        });
-        if (dockerShContent.isErr()) {
-            throw new Error(`Failed to generate docker.sh: ${dockerShContent.unwrapErr().message}`);
-        }
-        vfs.write(`/scripts/${DOCKER_SH_FILENAME}`, dockerShContent.unwrap());
         const packageJsonContent = await Generator.generateFromTemplate({
             file: path.resolve(__dirname, './template/e2e', PACKAGE_JSON_FILENAME),
             context: templateContext,
@@ -85,6 +72,7 @@ exports.generator = {
         vfs.write(`/e2e/${PACKAGE_JSON_FILENAME}`, packageJsonContent.unwrap());
         // write dynamic files
         vfs.write('/e2e/support/model-test-ids.ts', (0, model_test_id_generator_1.generateModelTestIds)(context.e2e));
+        vfs.write('/scripts/docker.sh', (0, docker_sh_generator_1.generateDockerSh)(context));
         context.vfs.insertFromVfs({ vfs, targetPath: '/' });
         return context;
     },

package/dist/e2e/e2e.generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"e2e.generator.js","sourceRoot":"","sources":["../../src/e2e/e2e.generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"e2e.generator.js","sourceRoot":"","sources":["../../src/e2e/e2e.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAiC;AAEjC,6DAA8C;AAI9C,0EAAmE;AACnE,kFAA2E;AAE3E,MAAM,qBAAqB,GAAG,cAAc,CAAA;AAsB/B,QAAA,WAAW,GAAG,SAAS,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAA;AAErD,QAAA,SAAS,GAAiC;IACrD,EAAE,EAAE,mBAAW;IACf,QAAQ,EAAE,CAAC,mBAAW,CAAC;IAEvB,QAAQ,EAAE,CAAiD,GAAY,EAAiB,EAAE;QACxF,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;QACvF,OAAO;YACL,GAAG,GAAG;YACN,GAAG,EAAE;gBACH,OAAO,EAAE,EAAE;aACZ;SACF,CAAA;IACH,CAAC;IAED,QAAQ,EAAE,KAAK,EAAiC,OAAgB,EAAoB,EAAE;QACpF,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,iBAAiB,EAAE,CAAA;QAC7C,MAAM,eAAe,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAA;QAElD,mEAAmE;QACnE,MAAM,GAAG,CAAC,UAAU,CAAC;YACnB,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,gBAAgB,CAAC;YACnD,UAAU,EAAE,MAAM;YAClB,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,CAAC;SAChE,CAAC,CAAA;QAEF,wCAAwC;QACxC,MAAM,kBAAkB,GAAG,MAAM,SAAS,CAAC,oBAAoB,CAAC;YAC9D,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,gBAAgB,EAAE,qBAAqB,CAAC;YACtE,OAAO,EAAE,eAAe;SACzB,CAAC,CAAA;QACF,IAAI,kBAAkB,CAAC,KAAK,EAAE,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,oCAAoC,kBAAkB,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;QAC/F,CAAC;QACD,GAAG,CAAC,KAAK,CAAC,QAAQ,qBAAqB,EAAE,EAAE,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAA;QAEvE,sBAAsB;QACtB,GAAG,CAAC,KAAK,CAAC,gCAAgC,EAAE,IAAA,8CAAoB,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;QAC9E,GAAG,CAAC,KAAK,CAAC,oBAAoB,EAAE,IAAA,sCAAgB,EAAC,OAAO,CAAC,CAAC,CAAA;QAE1D,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAA;QAEnD,OAAO,OAAO,CAAA;IAChB,CAAC;CACF,CAAA"}

package/dist/e2e/generators/docker-sh.generator.d.ts

@@ -0,0 +1,2 @@
+import { ContextResult } from '../e2e.generator';
+export declare function generateDockerSh({ schema: { projectType, slug } }: ContextResult): string;

package/dist/e2e/generators/docker-sh.generator.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateDockerSh = generateDockerSh;
+function generateDockerSh({ schema: { projectType, slug } }) {
+    const mountPath = projectType === 'workspace' ? '../../' : '${PWD}';
+    const workDir = projectType === 'workspace' ? `/pxl/projects/${slug}/e2e` : '/pxl/e2e';
+    return /*sh*/ String.raw `#!/bin/bash
+# This script should only be run via 'pnpm docker' in the project root!
+# Define a name for the image
+IMAGE_NAME="e2e-pxl-env"
+
+# Build the image from the Dockerfile in the current directory
+docker build -t $IMAGE_NAME ./e2e/
+
+# Run a container from the built image
+# Add user mapping only on Linux/WSL to avoid permission issues with mounted volumes
+USER_FLAG=""
+if [[ "$(uname)" = "Linux" ]]; then
+    USER_FLAG="-u $(id -u):$(id -g)"
+fi
+${projectType === 'workspace' ? '# Mount the entire monorepo to preserve pnpm workspace symlinks' : ''}
+docker run -p 3030:3030 $USER_FLAG -v ${mountPath}:/pxl -w ${workDir} --rm -it $IMAGE_NAME /bin/bash
+`;
+}
+//# sourceMappingURL=docker-sh.generator.js.map

package/dist/e2e/generators/docker-sh.generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"docker-sh.generator.js","sourceRoot":"","sources":["../../../src/e2e/generators/docker-sh.generator.ts"],"names":[],"mappings":";;AAEA,4CAoBC;AApBD,SAAgB,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,EAAiB;IAC/E,MAAM,SAAS,GAAG,WAAW,KAAK,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAA;IACnE,MAAM,OAAO,GAAG,WAAW,KAAK,WAAW,CAAC,CAAC,CAAC,iBAAiB,IAAI,MAAM,CAAC,CAAC,CAAC,UAAU,CAAA;IACtF,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA;;;;;;;;;;;;;;EAcxB,WAAW,KAAK,WAAW,CAAC,CAAC,CAAC,iEAAiE,CAAC,CAAC,CAAC,EAAE;wCAC9D,SAAS,YAAY,OAAO;CACnE,CAAA;AACD,CAAC"}

package/dist/frontend-core/template/src/context-providers/auth-context-provider.tsx

@@ -73,8 +73,8 @@ keycloak.onAuthError = () => {
 
 export function AuthProvider({ children }: Readonly<{ children: React.ReactNode }>) {
   const [user, setUser] = React.useState<AppUser | null>(null)
-  const [isAuthenticated, setIsAuthenticated] = useState(false)
-  const [isInitComplete, setIsInitComplete] = useState(false)
+  const [isAuthenticated, setIsAuthenticated] = useState(!APP_CONFIG.AUTH)
+  const [isInitComplete, setIsInitComplete] = useState(!APP_CONFIG.AUTH)
 
   const trpc = useTRPC()
 
@@ -137,9 +137,6 @@ export function AuthProvider({ children }: Readonly<{ children: React.ReactNode
 
     if (APP_CONFIG.AUTH) {
       void initKeycloak()
-    } else {
-      setIsAuthenticated(true)
-      setIsInitComplete(true)
     }
   }, [logout])
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generators",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Code generators for PXL - generates backend, frontend, Prisma schemas, and more",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/dist/e2e/template/scripts/docker.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# Define a name for the image
-IMAGE_NAME="e2e-pxl-env"
-
-# Build the image from the Dockerfile in the current directory
-docker build -t $IMAGE_NAME ./e2e/
-
-# Run a container from the built image
-# Add user mapping only on Linux/WSL to avoid permission issues with mounted volumes
-USER_FLAG=""
-if [[ "$(uname)" = "Linux" ]]; then
-    USER_FLAG="-u $(id -u):$(id -g)"
-fi
-
-docker run -p 3030:3030 $USER_FLAG -v ${PWD}:/pxl -w /pxl/e2e --rm -it $IMAGE_NAME /bin/bash
-