@augment-vir/node 30.0.2 → 30.0.3

package/dist/augments/path/os-path.js

@@ -7,10 +7,10 @@ import { sep } from 'node:path';
  * @package [`@augment-vir/node`](https://www.npmjs.com/package/@augment-vir/node)
  */
 export function replaceWithWindowsPathIfNeeded(input) {
+    /** No single system will test all of these lines so we must ignore them all. */
+    /* node:coverage ignore next 5 */
     if (sep === '/') {
         return input;
-        /** Can't test on Windows. */
-        /* node:coverage ignore next 3 */
     }
     else {
         return input.replace(/\//g, sep);

package/dist/docker/containers/run-container.d.ts

@@ -18,5 +18,6 @@ export type RunDockerContainerParams = {
     removeWhenDone?: boolean;
     dockerFlags?: ReadonlyArray<string>;
     useCurrentUser?: boolean;
+    platform?: string;
 };
-export declare function runContainer({ containerName, imageName, detach, command, portMapping, volumeMapping, envMapping, executionEnv, removeWhenDone, useCurrentUser, dockerFlags, }: RunDockerContainerParams): Promise<void>;
+export declare function runContainer({ containerName, imageName, detach, command, portMapping, volumeMapping, envMapping, executionEnv, removeWhenDone, useCurrentUser, dockerFlags, platform, }: RunDockerContainerParams): Promise<void>;

package/dist/docker/containers/run-container.js

@@ -4,7 +4,7 @@ import { updateImage } from '../docker-image.js';
 import { waitUntilContainerRunning } from './container-status.js';
 import { makeEnvFlags, makePortMapFlags, makeVolumeFlags, } from './docker-command-inputs.js';
 import { killContainer } from './kill-container.js';
-export async function runContainer({ containerName, imageName, detach, command, portMapping, volumeMapping, envMapping, executionEnv, removeWhenDone, useCurrentUser, dockerFlags = [], }) {
+export async function runContainer({ containerName, imageName, detach, command, portMapping, volumeMapping, envMapping, executionEnv, removeWhenDone, useCurrentUser, dockerFlags = [], platform, }) {
     try {
         const portMapFlags = makePortMapFlags(portMapping);
         const envFlags = makeEnvFlags(envMapping);
@@ -12,7 +12,7 @@ export async function runContainer({ containerName, imageName, detach, command,
         const volumeMapFlags = makeVolumeFlags(volumeMapping);
         const rmFlag = removeWhenDone ? '--rm' : '';
         const userFlag = useCurrentUser ? '--user "$(id -u)":"$(id -g)"' : '';
-        await updateImage(imageName);
+        await updateImage(imageName, platform);
         const fullCommand = [
             'docker',
             'run',

package/dist/docker/containers/run-container.mock.js

@@ -9,6 +9,7 @@ export async function runMockLongLivingContainer(containerName, args = {}) {
             '-t',
         ],
         command: 'sh',
+        platform: 'amd64',
         ...args,
     });
 }

package/dist/docker/docker-image.d.ts

@@ -1,6 +1,6 @@
 export declare function updateImage(
 /** @example 'alpine:3.20.2' */
-imageName: string): Promise<void>;
+imageName: string, platform?: string): Promise<void>;
 export declare function isImageInLocalRegistry(
 /** @example 'alpine:3.20.2' */
 imageName: string): Promise<boolean>;

package/dist/docker/docker-image.js

@@ -1,13 +1,25 @@
+import { wrapString } from '@augment-vir/common';
 import { ensureError } from '@augment-vir/core';
 import { runShellCommand } from '../augments/terminal/shell.js';
 export async function updateImage(
 /** @example 'alpine:3.20.2' */
-imageName) {
+imageName, platform) {
     if (await isImageInLocalRegistry(imageName)) {
         /** If image already exists then we don't need to update it. */
         return;
     }
-    await runShellCommand(`docker pull '${imageName}'`, {
+    const command = [
+        'docker',
+        'pull',
+        ...(platform
+            ? [
+                '--platform',
+                platform,
+            ]
+            : []),
+        wrapString({ value: imageName, wrapper: "'" }),
+    ].join(' ');
+    await runShellCommand(command, {
         rejectOnError: true,
     });
 }

package/dist/docker/run-docker-test.mock.js

@@ -1,6 +1,6 @@
 import { isOperatingSystem, OperatingSystem } from '../augments/os/operating-system.js';
 export function dockerTest(callback) {
-    if (isOperatingSystem(OperatingSystem.Mac) && process.env.CI) {
+    if (!isOperatingSystem(OperatingSystem.Linux) && process.env.CI) {
         /**
          * We cannot test Docker on macOS GitHub Actions runners.
          *
@@ -10,6 +10,13 @@ export function dockerTest(callback) {
          * - https://github.com/actions/runner-images/issues/2150
          * - https://github.com/actions/runner/issues/1456
          */
+        /**
+         * We cannot test Docker on Windows GitHub Actions runners because Docker cannot run in
+         * Linux container mode on Windows GitHub Actions runners.
+         *
+         * @see
+         * - https://github.com/orgs/community/discussions/25491#discussioncomment-3248089
+         */
         return () => { };
     }
     return callback;

package/dist/prisma/model-data.d.ts

@@ -1,4 +1,5 @@
 import { BasePrismaClient, PrismaAllModelsCreate, type PartialWithUndefined, type PrismaAllBasicModels, type PrismaModelName } from '@augment-vir/common';
+import type { IsAny } from 'type-fest';
 /**
  * Params for {@link addData}. This is similar to {@link PrismaAllModelsCreate} but allows an array of
  * {@link PrismaAllModelsCreate} for sequential data creation.
@@ -47,7 +48,7 @@ import { BasePrismaClient, PrismaAllModelsCreate, type PartialWithUndefined, typ
  * @package [`@augment-vir/node`](https://www.npmjs.com/package/@augment-vir/node)
  */
 export type PrismaAddDataData<PrismaClient extends BasePrismaClient> = Readonly<PrismaAllModelsCreate<PrismaClient>> | ReadonlyArray<Readonly<PrismaAllModelsCreate<PrismaClient>>>;
-export declare function addData<const PrismaClient extends BasePrismaClient>(prismaClient: Readonly<PrismaClient>, data: PrismaAddDataData<PrismaClient>): Promise<void>;
+export declare function addData<const PrismaClient extends BasePrismaClient>(prismaClient: Readonly<PrismaClient>, data: IsAny<PrismaClient> extends true ? any : PrismaAddDataData<PrismaClient>): Promise<void>;
 export declare function getAllPrismaModelNames<const PrismaClient extends BasePrismaClient>(prismaClient: PrismaClient): PrismaModelName<PrismaClient>[];
 /**
  * Options for `prisma.client.dumpData`.

package/dist/prisma/prisma-database.mock.js

@@ -1,7 +1,25 @@
-import { rm } from 'node:fs/promises';
+import { awaitedForEach, callWithRetries, wait } from '@augment-vir/common';
+import { interpolationSafeWindowsPath } from '../augments/path/os-path.js';
+import { runShellCommand } from '../augments/terminal/shell.js';
 import { generatedPrismaClientDirPath, notCommittedDirPath, testPrismaMigrationsDirPath, } from '../file-paths.mock.js';
+const pathsToDelete = [
+    generatedPrismaClientDirPath,
+    notCommittedDirPath,
+    testPrismaMigrationsDirPath,
+];
 export async function clearTestDatabaseOutputs() {
-    await rm(generatedPrismaClientDirPath, { force: true, recursive: true });
-    await rm(notCommittedDirPath, { force: true, recursive: true });
-    await rm(testPrismaMigrationsDirPath, { force: true, recursive: true });
+    await callWithRetries(10, async () => {
+        await wait({ seconds: 1 });
+        await awaitedForEach(pathsToDelete, async (pathToDelete) => {
+            /**
+             * This way of deleting files is required for Windows tests running on GitHub Actions.
+             * Otherwise, we get the following error:
+             *
+             *     EPERM: operation not permitted, unlink 'D:\a\augment-vir\augment-vir\packages\node\node_modules\.prisma\query_engine-windows.dll.node'
+             */
+            await runShellCommand(`rm -rf ${interpolationSafeWindowsPath(pathToDelete)}`, {
+                rejectOnError: true,
+            });
+        });
+    });
 }

package/dist/prisma/run-prisma-command.js

@@ -1,4 +1,5 @@
 import { log } from '@augment-vir/common';
+import { interpolationSafeWindowsPath } from '../augments/path/os-path.js';
 import { runShellCommand } from '../augments/terminal/shell.js';
 import { PrismaSchemaError } from './prisma-errors.js';
 const prismaCommandsThatSupportNoHints = [
@@ -24,7 +25,7 @@ schemaFilePath, env = {}) {
         noHintsArg,
     ].join(' ');
     log.faint(`> ${fullCommand}`);
-    const result = await runShellCommand(fullCommand, {
+    const result = await runShellCommand(interpolationSafeWindowsPath(fullCommand), {
         env: {
             ...process.env,
             ...env,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/node",
-    "version": "30.0.2",
+    "version": "30.0.3",
     "description": "A collection of augments, helpers types, functions, and classes only for Node.js (backend) JavaScript environments.",
     "keywords": [
         "augment",
@@ -32,8 +32,8 @@
     "types": "dist/index.d.ts",
     "scripts": {
         "compile": "virmator compile",
-        "test": "virmator --no-deps test node --test-concurrency 1",
-        "test:coverage": "virmator test node coverage --test-concurrency 1",
+        "test": "npm i @prisma/client && virmator --no-deps test node --test-concurrency 1",
+        "test:coverage": "npm i @prisma/client && virmator test node coverage --test-concurrency 1",
         "test:update": "npm test"
     },
     "dependencies": {
@@ -55,7 +55,7 @@
         "@web/test-runner-playwright": "^0.11.0",
         "@web/test-runner-visual-regression": "^0.10.0",
         "c8": "^10.1.2",
-        "concurrently": "^9.0.0",
+        "concurrently": "^9.0.1",
         "istanbul-smart-text-reporter": "^1.1.4",
         "prisma": "^5.19.1"
     },