@atls/code-schematics 2.0.28 → 2.0.30

package/dist/getters/index.d.ts

@@ -1,2 +1,2 @@
-export * from './stream-report-options.getter.js';
-export * from './stream-report-callback.getter.js';
+export * from './stream-report-options.js';
+export * from './stream-report-callback.js';

package/dist/getters/index.js

@@ -1,2 +1,2 @@
-export * from "./stream-report-options.getter.js";
-export * from "./stream-report-callback.getter.js";
+export * from "./stream-report-options.js";
+export * from "./stream-report-callback.js";

package/dist/getters/{stream-report-callback.getter.js → stream-report-callback.js}

@@ -3,18 +3,15 @@ import { xfs } from '@yarnpkg/fslib';
 import { runSchematicHelper } from '../helpers/index.js';
 import { writeTmpSchematicHelper } from '../helpers/index.js';
 import { prepareTmpDir } from '../helpers/index.js';
+import { ensureSchematicSucceeded } from '../helpers/index.js';
 export const getStreamReportCallback = async (options) => {
     const streamReportCallback = async (report) => {
-        try {
-            const tmpDir = await xfs.mktempPromise();
-            const collectionPath = ppath.join(tmpDir, 'collection.json');
-            await writeTmpSchematicHelper(tmpDir);
-            await prepareTmpDir(tmpDir);
-            await runSchematicHelper('project', options, collectionPath);
-        }
-        catch (error) {
-            console.error(error);
-        }
+        const tmpDir = await xfs.mktempPromise();
+        const collectionPath = ppath.join(tmpDir, 'collection.json');
+        const { cwd } = options;
+        await writeTmpSchematicHelper(tmpDir, cwd);
+        await prepareTmpDir(tmpDir);
+        ensureSchematicSucceeded(await runSchematicHelper('project', options, collectionPath));
     };
     return streamReportCallback;
 };

package/dist/helpers/code-runtime.d.ts

@@ -0,0 +1,2 @@
+export declare const writeCodeRuntimeFiles: (cwd: string, baseDir: string) => Promise<void>;
+export declare const getCodeRuntimeCompilerOptions: (cwd: string) => Promise<object>;

package/dist/helpers/code-runtime.js

@@ -0,0 +1,47 @@
+import { spawn } from 'node:child_process';
+import { CodeRuntimeCommandException } from '../exceptions/index.js';
+const YARN_EXECUTABLE = process.platform === 'win32' ? 'yarn.cmd' : 'yarn';
+const CODE_RUNTIME_PACKAGE = '@atls/code-runtime';
+const WRITE_FILES_SCRIPT = `
+const { writeFiles } = await import('${CODE_RUNTIME_PACKAGE}')
+const [baseDir] = process.argv.slice(1)
+
+await writeFiles(baseDir)
+`;
+const COMPILER_OPTIONS_SCRIPT = `
+const { tsConfig } = await import('${CODE_RUNTIME_PACKAGE}')
+
+process.stdout.write(JSON.stringify(tsConfig.compilerOptions))
+`;
+const createProjectEnvironment = () => {
+    const environment = { ...process.env };
+    delete environment.NODE_OPTIONS;
+    delete environment.YARN_IGNORE_PATH;
+    return environment;
+};
+const runCodeRuntimeScript = async (cwd, script, args = []) => {
+    const child = spawn(YARN_EXECUTABLE, ['node', '--input-type=module', '-e', script, ...args], {
+        cwd,
+        env: createProjectEnvironment(),
+        shell: process.platform === 'win32',
+        stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    const stdoutChunks = [];
+    const stderrChunks = [];
+    child.stdout.on('data', (chunk) => stdoutChunks.push(chunk));
+    child.stderr.on('data', (chunk) => stderrChunks.push(chunk));
+    const exitCode = await new Promise((resolve, reject) => {
+        child.once('error', reject);
+        child.once('exit', resolve);
+    });
+    const stdout = Buffer.concat(stdoutChunks).toString('utf-8');
+    const stderr = Buffer.concat(stderrChunks).toString('utf-8').trim();
+    if (exitCode !== 0) {
+        throw new CodeRuntimeCommandException(stderr || `exit code ${exitCode}`);
+    }
+    return stdout;
+};
+export const writeCodeRuntimeFiles = async (cwd, baseDir) => {
+    await runCodeRuntimeScript(cwd, WRITE_FILES_SCRIPT, [baseDir]);
+};
+export const getCodeRuntimeCompilerOptions = async (cwd) => JSON.parse(await runCodeRuntimeScript(cwd, COMPILER_OPTIONS_SCRIPT));

package/dist/helpers/index.d.ts

@@ -1,3 +1,5 @@
-export * from './run-schematics.helper.js';
-export * from './write-tmp-schematic.helper.js';
-export * from './prepare-tmp-dir.helper.js';
+export * from './run-schematics.js';
+export * from './write-tmp-schematic.js';
+export * from './prepare-tmp-dir.js';
+export * from './code-runtime.js';
+export * from './schematic-result.js';

package/dist/helpers/index.js

@@ -1,3 +1,5 @@
-export * from "./run-schematics.helper.js";
-export * from "./write-tmp-schematic.helper.js";
-export * from "./prepare-tmp-dir.helper.js";
+export * from "./run-schematics.js";
+export * from "./write-tmp-schematic.js";
+export * from "./prepare-tmp-dir.js";
+export * from "./code-runtime.js";
+export * from "./schematic-result.js";

package/dist/helpers/{run-schematics.helper.js → run-schematics.js}

@@ -1,6 +1,6 @@
 import { UnsuccessfulWorkflowExecution } from '@angular-devkit/schematics';
 import { NodeWorkflow } from '@angular-devkit/schematics/tools';
-import { eventsLogHelper } from './events-log.helper.js';
+import { eventsLogHelper } from './events-log.js';
 export const runSchematicHelper = async (schematicName, options, collectionPath) => {
     const dryRun = false;
     const debug = true;

package/dist/helpers/schematic-result.d.ts

@@ -0,0 +1 @@
+export declare const ensureSchematicSucceeded: (exitCode: 0 | 1) => void;

package/dist/helpers/schematic-result.js

@@ -0,0 +1,6 @@
+import { SchematicWorkflowException } from '../exceptions/index.js';
+export const ensureSchematicSucceeded = (exitCode) => {
+    if (exitCode !== 0) {
+        throw new SchematicWorkflowException(exitCode);
+    }
+};

package/dist/helpers/{write-tmp-schematic.helper.d.ts → write-tmp-schematic.d.ts}

@@ -1,2 +1,2 @@
 import type { PortablePath } from '@yarnpkg/fslib';
-export declare const writeTmpSchematicHelper: (tmpDir: PortablePath) => Promise<void>;
+export declare const writeTmpSchematicHelper: (tmpDir: PortablePath, cwd?: string) => Promise<void>;

package/dist/helpers/{write-tmp-schematic.helper.js → write-tmp-schematic.js}

@@ -1,9 +1,9 @@
 import { mkdir } from 'node:fs/promises';
 import { ppath } from '@yarnpkg/fslib';
 import { writeSchematicFactory } from '../generated/index.js';
-export const writeTmpSchematicHelper = async (tmpDir) => {
-    const { writeFiles } = await import('@atls/code-runtime');
-    await writeFiles(tmpDir);
+import { writeCodeRuntimeFiles } from './code-runtime.js';
+export const writeTmpSchematicHelper = async (tmpDir, cwd = process.cwd()) => {
+    await writeCodeRuntimeFiles(cwd, tmpDir);
     const projectDir = ppath.join(tmpDir, 'project');
     await mkdir(projectDir, { recursive: true });
     await writeSchematicFactory(ppath.join(projectDir, 'project.factory.cjs'));

package/dist/schematic/project/{project.factory.js → factory.js}

@@ -37,7 +37,7 @@ export const main = (options) => {
     const state = {};
     return chain([
         captureGitIgnoreContentRule(state),
-        updateTsConfigRule,
+        updateTsConfigRule(options),
         mergeWith(generateCommonSource(options), MergeStrategy.Overwrite),
         mergeWith(generateProjectSpecificSource(options), MergeStrategy.Overwrite),
         mergeGitIgnoreContentRule(state),

package/dist/schematic/project/index.d.ts

@@ -1 +1 @@
-export * from './project.factory.js';
+export * from './factory.js';

package/dist/schematic/project/index.js

@@ -1 +1 @@
-export * from "./project.factory.js";
+export * from "./factory.js";

package/dist/schematic/rules/index.d.ts

@@ -1 +1 @@
-export * from './update-ts-config.rule.js';
+export * from './tsconfig.update.js';

package/dist/schematic/rules/index.js

@@ -1 +1 @@
-export * from "./update-ts-config.rule.js";
+export * from "./tsconfig.update.js";

package/dist/schematic/rules/tsconfig.update.d.ts

@@ -0,0 +1,7 @@
+import type { Rule } from '@angular-devkit/schematics';
+interface UpdateTsConfigRuleOptions extends Record<string, string | undefined> {
+    cwd?: string;
+    runtimeCwd?: string;
+}
+export declare const updateTsConfigRule: (options: UpdateTsConfigRuleOptions) => Rule;
+export {};

package/dist/schematic/rules/tsconfig.update.js

@@ -0,0 +1,6 @@
+import { getCodeRuntimeCompilerOptions } from '../../helpers/index.js';
+import { updateTsConfigInTree } from '../utils/tsconfig.utils.js';
+export const updateTsConfigRule = (options) => async () => {
+    const compilerOptions = await getCodeRuntimeCompilerOptions(options.runtimeCwd ?? options.cwd ?? process.cwd());
+    return updateTsConfigInTree(compilerOptions);
+};

package/dist/scripts/exceptions/index.d.ts

@@ -1 +1 @@
-export * from './undefined-build-result.exception.js';
+export * from './undefined-build-result.js';

package/dist/scripts/exceptions/index.js

@@ -1 +1 @@
-export * from "./undefined-build-result.exception.js";
+export * from "./undefined-build-result.js";

package/dist/scripts/getters/{generated-file-content.getter.js → generated-file-content.js}

@@ -1,13 +1,14 @@
 const WRITE_SCHEMATIC_FACTORY_FUNCTION = `export const writeSchematicFactory = async (path: string) => {
-  const content = Buffer.from(schematicFactoryCjsBase64, "base64").toString("utf-8");
+  const content = Buffer.from(schematicFactoryCjsBase64, 'base64').toString('utf-8')
   const fs = await import('fs/promises')
-  await fs.writeFile(path, content);
-};`;
+  await fs.writeFile(path, content)
+}`;
 export const getGeneratedFileContent = (encodedContent) => {
     const generatedFileContent = `// Auto-generated file
 /* eslint-disable */
 
-export const schematicFactoryCjsBase64 = "${encodedContent}";
+export const schematicFactoryCjsBase64 =
+  '${encodedContent}'
 
 ${WRITE_SCHEMATIC_FACTORY_FUNCTION}
 `;

package/dist/scripts/getters/index.d.ts

@@ -1,4 +1,4 @@
-export * from './esbuild-config.getter.js';
-export * from './cjs-content.getter.js';
-export * from './encoded-content.getter.js';
-export * from './generated-file-content.getter.js';
+export * from './esbuild-config.js';
+export * from './cjs-content.js';
+export * from './encoded-content.js';
+export * from './generated-file-content.js';

package/dist/scripts/getters/index.js

@@ -1,4 +1,4 @@
-export * from "./esbuild-config.getter.js";
-export * from "./cjs-content.getter.js";
-export * from "./encoded-content.getter.js";
-export * from "./generated-file-content.getter.js";
+export * from "./esbuild-config.js";
+export * from "./cjs-content.js";
+export * from "./encoded-content.js";
+export * from "./generated-file-content.js";

package/dist/scripts/index.d.ts

@@ -1 +1 @@
-export * from './schematic-build.script.js';
+export * from './schematic-build.js';

package/dist/scripts/index.js

@@ -1 +1 @@
-export * from "./schematic-build.script.js";
+export * from "./schematic-build.js";

package/dist/scripts/{schematic-smoke.script.js → schematic-smoke.js}

@@ -9,7 +9,7 @@ const helperScanRoots = [
     'scripts/raijin',
     'README.md',
     'README_EN.md',
-    'code/code-schematics/src/scripts/schematic-smoke.script.ts',
+    'code/code-schematics/src/scripts/schematic-smoke.ts',
     'docs/README.md',
     'docs/README.ru.md',
     'docs/raijin/README.md',
@@ -100,13 +100,14 @@ const prepareCollectionDir = async (repoRoot, collectionDir) => {
         process.chdir(previousCwd);
     }
 };
-const runProjectSchematic = async ({ collectionPath, fixtureDir, }) => {
+const runProjectSchematic = async ({ collectionPath, fixtureDir, runtimeCwd, }) => {
     const previousCwd = process.cwd();
     try {
         process.chdir(fixtureDir);
         const exitCode = await runSchematicHelper('project', {
             type: 'project',
             cwd: fixtureDir,
+            runtimeCwd,
         }, collectionPath);
         if (exitCode !== 0) {
             throw new Error(`Schematic workflow failed with exit code ${exitCode}`);
@@ -154,6 +155,7 @@ const runSchematicSmoke = async () => {
         await runProjectSchematic({
             collectionPath: path.join(collectionDir, 'collection.json'),
             fixtureDir,
+            runtimeCwd: repoRoot,
         });
         console.log('Schematic smoke: checking fixture');
         await assertGeneratedFixture(fixtureDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atls/code-schematics",
-  "version": "2.0.28",
+  "version": "2.0.30",
   "license": "BSD-3-Clause",
   "type": "module",
   "exports": {
@@ -17,10 +17,10 @@
   "scripts": {
     "build": "yarn run build:schematic-factory && yarn run build:library",
     "build:library": "yarn library build",
-    "build:schematic-factory": "yarn node ./src/scripts/schematic-factory-build.script.ts",
+    "build:schematic-factory": "yarn node ./src/scripts/schematic-factory-build.ts",
     "prepack": "yarn run build",
     "postpack": "rm -rf dist",
-    "smoke:schematic": "yarn node ./src/scripts/schematic-smoke.script.ts"
+    "smoke:schematic": "yarn node ./src/scripts/schematic-smoke.ts"
   },
   "dependencies": {
     "@angular-devkit/core": "19.1.5",

package/dist/schematic/rules/update-ts-config.rule.d.ts

@@ -1,2 +0,0 @@
-import { updateTsConfigInTree } from '../utils/tsconfig.utils.js';
-export declare const updateTsConfigRule: () => Promise<ReturnType<typeof updateTsConfigInTree>>;

package/dist/schematic/rules/update-ts-config.rule.js

@@ -1,7 +0,0 @@
-import { updateTsConfigInTree } from '../utils/tsconfig.utils.js';
-export const updateTsConfigRule = async () => {
-    const { tsConfig } = await import('@atls/code-runtime');
-    return updateTsConfigInTree({
-        ...tsConfig.compilerOptions,
-    });
-};