@atls/code-schematics 2.0.30 → 2.2.0

package/dist/helpers/index.d.ts

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

package/dist/helpers/index.js

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

package/dist/helpers/raijin.d.ts

@@ -0,0 +1,2 @@
+export declare const writeRaijinFiles: (_cwd: string, baseDir: string) => Promise<void>;
+export declare const getRaijinCompilerOptions: (_cwd: string) => Promise<object>;

package/dist/helpers/raijin.js

@@ -0,0 +1,6 @@
+import tsconfig from '@atls/config-typescript';
+import { writeFiles as writeGeneratedRaijinFiles } from '../generated/raijin-schematic-export.js';
+export const writeRaijinFiles = async (_cwd, baseDir) => {
+    await writeGeneratedRaijinFiles(baseDir);
+};
+export const getRaijinCompilerOptions = async (_cwd) => tsconfig.compilerOptions;

package/dist/helpers/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';
-import { writeCodeRuntimeFiles } from './code-runtime.js';
+import { writeRaijinFiles } from './raijin.js';
 export const writeTmpSchematicHelper = async (tmpDir, cwd = process.cwd()) => {
-    await writeCodeRuntimeFiles(cwd, tmpDir);
+    await writeRaijinFiles(cwd, tmpDir);
     const projectDir = ppath.join(tmpDir, 'project');
     await mkdir(projectDir, { recursive: true });
     await writeSchematicFactory(ppath.join(projectDir, 'project.factory.cjs'));

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

@@ -1,7 +1,6 @@
 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 declare const updateTsConfigRule: (_options: UpdateTsConfigRuleOptions) => Rule;
 export {};

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

@@ -1,6 +1,3 @@
-import { getCodeRuntimeCompilerOptions } from '../../helpers/index.js';
+import tsconfig from '@atls/config-typescript';
 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);
-};
+export const updateTsConfigRule = (_options) => async () => updateTsConfigInTree(tsconfig.compilerOptions);

package/dist/schematic/sources/generate-project-specific.source.js

@@ -5,9 +5,14 @@ import { apply } from '@angular-devkit/schematics';
 import { url } from '@angular-devkit/schematics';
 import { template } from '@angular-devkit/schematics';
 import { move } from '@angular-devkit/schematics';
+const templateTypes = {
+    library: 'libraries',
+    project: 'project',
+};
 export const generateProjectSpecificSource = (options) => {
     const { name: projectName } = JSON.parse(readFileSync(join(options.cwd, 'package.json'), 'utf-8'));
-    return apply(url(join('../templates', options.type)), [
+    const templateType = templateTypes[options.type] ?? options.type;
+    return apply(url(join('../templates', templateType)), [
         template({
             ...strings,
             ...options,

package/dist/scripts/getters/esbuild-config.js

@@ -10,7 +10,7 @@ export const getEsbuildConfig = () => {
         platform: 'node',
         sourcemap: false,
         target: 'esnext',
-        external: ['node:*', '@atls/code-runtime'],
+        external: ['node:*'],
         plugins: [
             pnpPlugin({
                 onResolve: async (args) => {

package/dist/scripts/schematic-factory-build.js

@@ -1,6 +1,11 @@
+import { join } from 'node:path';
 import { esbuildBuildStep } from './build-steps/index.js';
+import { generateSchematic } from './schematic-build.js';
+const raijinSchematicDir = join(import.meta.dirname, '../../../../yarn/raijin/src/runtime/schematic');
+const raijinSchematicOutputFile = join(import.meta.dirname, '../generated/raijin-schematic-export.ts');
 try {
     await esbuildBuildStep();
+    await generateSchematic(raijinSchematicDir, raijinSchematicOutputFile);
 }
 catch (e) {
     const error = e;

package/dist/scripts/schematic-smoke.js

@@ -100,14 +100,13 @@ const prepareCollectionDir = async (repoRoot, collectionDir) => {
         process.chdir(previousCwd);
     }
 };
-const runProjectSchematic = async ({ collectionPath, fixtureDir, runtimeCwd, }) => {
+const runProjectSchematic = async ({ collectionPath, fixtureDir, }) => {
     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}`);
@@ -155,7 +154,6 @@ 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.30",
+  "version": "2.2.0",
   "license": "BSD-3-Clause",
   "type": "module",
   "exports": {
@@ -25,11 +25,11 @@
   "dependencies": {
     "@angular-devkit/core": "19.1.5",
     "@angular-devkit/schematics": "19.1.5",
+    "@atls/config-typescript": "2.0.3",
     "js-yaml": "4.1.0",
     "strip-json-comments": "3.1.1"
   },
   "devDependencies": {
-    "@atls/code-runtime": "2.1.34",
     "@types/node": "24.12.2",
     "@yarnpkg/cli": "4.14.1",
     "@yarnpkg/core": "4.7.0",

package/dist/exceptions/code-runtime-command.d.ts

@@ -1,3 +0,0 @@
-export declare class CodeRuntimeCommandException extends Error {
-    constructor(error: string);
-}

package/dist/exceptions/code-runtime-command.js

@@ -1,5 +0,0 @@
-export class CodeRuntimeCommandException extends Error {
-    constructor(error) {
-        super(`Code runtime command failed: ${error}`);
-    }
-}

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

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

package/dist/helpers/code-runtime.js

@@ -1,47 +0,0 @@
-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));