npm - @baseplate-dev/core-generators - Versions diffs - 0.2.2 → 0.2.3 - Mend

@baseplate-dev/core-generators 0.2.2 → 0.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (106) hide show

package/dist/generators/docker/docker-compose/docker-compose.generator.d.ts CHANGED Viewed

@@ -4,6 +4,7 @@ export declare const dockerComposeGenerator: import("@baseplate-dev/sync").Gener
     postgres?: {
         port?: number | undefined;
         password?: string | undefined;
+        database?: string | undefined;
     } | null | undefined;
     redis?: {
         port?: number | undefined;

package/dist/generators/docker/docker-compose/docker-compose.generator.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"docker-compose.generator.d.ts","sourceRoot":"","sources":["../../../../src/generators/docker/docker-compose/docker-compose.generator.ts"],"names":[],"mappings":"~~AA2BA~~,eAAO,MAAM,sBAAsB~~;;;;;;;;;;;;;;;EA+EjC~~,CAAC"}
1	+ {"version":3,"file":"docker-compose.generator.d.ts","sourceRoot":"","sources":["../../../../src/generators/docker/docker-compose/docker-compose.generator.ts"],"names":[],"mappings":"AA4BA,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;EAmIjC,CAAC"}

package/dist/generators/docker/docker-compose/docker-compose.generator.js CHANGED Viewed

@@ -11,6 +11,7 @@ const descriptorSchema = z.object({
         .object({
         port: z.number().default(5432),
         password: z.string().optional(),
+        database: z.string().optional(),
     })
         .nullish(),
     redis: z
@@ -36,16 +37,20 @@ export const dockerComposeGenerator = createGenerator({
                     outputs.push(generatePostgresDockerCompose({
                         port: postgres.port.toString(),
                         password: postgres.password ?? `${projectName}-password`,
+                        database: postgres.database ?? projectName,
+                        projectName,
                     }));
                 }
                 if (redis) {
                     outputs.push(generateRedisDockerCompose({
                         port: redis.port.toString(),
                         password: redis.password ?? `${projectName}-password`,
+                        projectName,
                     }));
                 }
                 const dockerComposePath = path.join(dockerFolder, 'docker-compose.yml');
                 const dockerEnvPath = path.join(dockerFolder, '.env');
+                const dockerEnvExamplePath = path.join(dockerFolder, '.env.example');
                 const serviceEntries = outputs.flatMap((output) => output.services);
                 const volumeEntries = outputs.flatMap((output) => output.volumes);
                 const services = `
@@ -54,13 +59,33 @@ ${serviceEntries.join('\n')}`.trim();
                 const volumes = `
 volumes:
 ${volumeEntries.join('\n')}`.trim();
+                const networks = `
+networks:
+  backend:
+    driver: bridge`.trim();
                 const entries = [
                     ...(serviceEntries.length > 0 ? [services] : []),
                     ...(volumeEntries.length > 0 ? [volumes] : []),
+                    ...(serviceEntries.length > 0 ? [networks] : []), // Add network if we have services
                 ];
                 if (serviceEntries.length === 0) {
                     throw new Error('No services defined for Docker Compose file');
                 }
+                // Generate environment variable documentation
+                const envVars = [`COMPOSE_PROJECT_NAME=${projectName}-dev`];
+                const envExampleVars = [
+                    '# Docker Compose Project Configuration',
+                    `COMPOSE_PROJECT_NAME=${projectName}-dev`,
+                    '',
+                ];
+                if (postgres) {
+                    envVars.push(`POSTGRES_PORT=${postgres.port}`, `POSTGRES_PASSWORD=${postgres.password ?? `${projectName}-password`}`, `POSTGRES_DB=${postgres.database ?? projectName}`);
+                    envExampleVars.push('# PostgreSQL Configuration', `POSTGRES_PORT=${postgres.port}`, `POSTGRES_PASSWORD=${postgres.password ?? `${projectName}-password`}`, `POSTGRES_DB=${postgres.database ?? projectName}`, '');
+                }
+                if (redis) {
+                    envVars.push(`REDIS_PORT=${redis.port}`, `REDIS_PASSWORD=${redis.password ?? `${projectName}-password`}`);
+                    envExampleVars.push('# Redis Configuration', `REDIS_PORT=${redis.port}`, `REDIS_PASSWORD=${redis.password ?? `${projectName}-password`}`, '');
+                }
                 return {
                     build: (builder) => {
                         builder.writeFile({
@@ -72,7 +97,12 @@ ${entries.join('\n')}`.trim()}\n`,
                         builder.writeFile({
                             id: 'docker-env',
                             destination: dockerEnvPath,
-                            contents: `COMPOSE_PROJECT_NAME=${projectName}-dev\n`,
+                            contents: `${envVars.join('\n')}\n`,
+                        });
+                        builder.writeFile({
+                            id: 'docker-env-example',
+                            destination: dockerEnvExamplePath,
+                            contents: `${envExampleVars.join('\n')}\n`,
                         });
                     },
                 };

package/dist/generators/docker/docker-compose/docker-compose.generator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"docker-compose.generator.js","sourceRoot":"","sources":["../../../../src/generators/docker/docker-compose/docker-compose.generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAExD,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC1C,QAAQ,EAAE,CAAC;SACR,MAAM,CAAC;QACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;QAC9B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAChC,CAAC;SACD,OAAO,EAAE;IACZ,KAAK,EAAE,CAAC;SACL,MAAM,CAAC;QACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;QAC9B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAChC,CAAC;SACD,OAAO,EAAE;CACb,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACpD,IAAI,EAAE,uBAAuB;IAC7B,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG;IACjC,gBAAgB;IAChB,UAAU,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC3B,IAAI,EAAE,mBAAmB,CAAC;YACxB,YAAY,EAAE;gBACZ,WAAW,EAAE,mBAAmB;aACjC;YACD,GAAG,CAAC,EAAE,WAAW,EAAE;gBACjB,MAAM,EACJ,WAAW,GAAG,WAAW,CAAC,cAAc,EAAE,EAC1C,YAAY,EACZ,QAAQ,EACR,KAAK,GACN,GAAG,UAAU,CAAC;gBAEf,MAAM,OAAO,GAA0B,EAAE,CAAC;gBAE1C,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,CAAC,IAAI,CACV,6BAA6B,CAAC;wBAC5B,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE;wBAC9B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,GAAG,WAAW,WAAW;~~qBACzD~~,CAAC,CACH,CAAC;gBACJ,CAAC;gBAED,IAAI,KAAK,EAAE,CAAC;oBACV,OAAO,CAAC,IAAI,CACV,0BAA0B,CAAC;wBACzB,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;wBAC3B,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,GAAG,WAAW,WAAW;~~qBACtD~~,CAAC,CACH,CAAC;gBACJ,CAAC;gBAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;gBACxE,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;~~gBAEtD~~,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACpE,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAElE,MAAM,QAAQ,GAAG;;EAEvB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;gBAE7B,MAAM,OAAO,GAAG;;EAEtB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;gBAE5B,MAAM,OAAO,GAAG;oBACd,GAAG,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAChD,GAAG,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;~~iBAC/C~~,CAAC;gBAEF,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAChC,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;gBACjE,CAAC;gBAED,OAAO;oBACL,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE;wBACjB,OAAO,CAAC,SAAS,CAAC;4BAChB,EAAE,EAAE,gBAAgB;4BACpB,WAAW,EAAE,iBAAiB;4BAC9B,QAAQ,EAAE,GAAG;EACzB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI;yBACpB,CAAC,CAAC;wBAEH,OAAO,CAAC,SAAS,CAAC;4BAChB,EAAE,EAAE,YAAY;4BAChB,WAAW,EAAE,aAAa;4BAC1B,QAAQ,EAAE,~~wBAAwB~~,WAAW,QAAQ;~~yBACtD~~,CAAC,CAAC;oBACL,CAAC;iBACF,CAAC;YACJ,CAAC;SACF,CAAC;KACH,CAAC;CACH,CAAC,CAAC"}
1	+ {"version":3,"file":"docker-compose.generator.js","sourceRoot":"","sources":["../../../../src/generators/docker/docker-compose/docker-compose.generator.ts"],"names":[],"mappings":"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"}

package/dist/generators/docker/docker-compose/postgres.d.ts CHANGED Viewed

@@ -2,6 +2,8 @@ import type { DockerComposeOutput } from './types.js';
 interface PostgresConfig {
     port: string;
     password: string;
+    database: string;
+    projectName: string;
 }
 export declare function generatePostgresDockerCompose(config: PostgresConfig): DockerComposeOutput;
 export {};

package/dist/generators/docker/docker-compose/postgres.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../../../src/generators/docker/docker-compose/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;~~CAClB~~;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,cAAc,GACrB,mBAAmB,~~CAoBrB~~"}
1	+ {"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../../../src/generators/docker/docker-compose/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,cAAc,GACrB,mBAAmB,CAiCrB"}

package/dist/generators/docker/docker-compose/postgres.js CHANGED Viewed

@@ -2,19 +2,32 @@ export function generatePostgresDockerCompose(config) {
     return {
         services: [
             `  db:
-    image: postgres:16.2-alpine
+    image: postgres:17.5-alpine
+    container_name: \${COMPOSE_PROJECT_NAME:-${config.projectName}}-db
     restart: on-failure
+    security_opt:
+      - no-new-privileges:true
     environment:
-      POSTGRES_PASSWORD: ${config.password}
+      POSTGRES_PASSWORD: \${POSTGRES_PASSWORD:-${config.password}}
+      POSTGRES_DB: \${POSTGRES_DB:-${config.database}}
+      POSTGRES_INITDB_ARGS: '--encoding=UTF8 --locale=en_US.utf8'
     ports:
       - "\${POSTGRES_PORT:-${config.port}}:5432"
     volumes:
       - db-data:/var/lib/postgresql/data
+    networks:
+      - backend
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ["CMD-SHELL", "pg_isready -U postgres -d \${POSTGRES_DB:-${config.database}}"]
       interval: 5s
       timeout: 2s
-      retries: 2`,
+      retries: 2
+      start_period: 10s`,
         ],
         volumes: ['  db-data:'],
     };

package/dist/generators/docker/docker-compose/postgres.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../../../src/generators/docker/docker-compose/postgres.ts"],"names":[],"mappings":"~~AAOA~~,MAAM,UAAU,6BAA6B,CAC3C,MAAsB;IAEtB,OAAO;QACL,QAAQ,EAAE;YACR~~;;;;2BAIqB~~,MAAM,CAAC,QAAQ~~;;6BAEb~~,MAAM,CAAC,IAAI~~;;;;;;;iBAOvB~~;~~SACZ~~;QACD,OAAO,EAAE,CAAC,YAAY,CAAC;KACxB,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../../../src/generators/docker/docker-compose/postgres.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,6BAA6B,CAC3C,MAAsB;IAEtB,OAAO;QACL,QAAQ,EAAE;YACR;;+CAEyC,MAAM,CAAC,WAAW;;;;;iDAKhB,MAAM,CAAC,QAAQ;qCAC3B,MAAM,CAAC,QAAQ;;;6BAGvB,MAAM,CAAC,IAAI;;;;;;;;;;;uEAW+B,MAAM,CAAC,QAAQ;;;;wBAI9D;SACnB;QACD,OAAO,EAAE,CAAC,YAAY,CAAC;KACxB,CAAC;AACJ,CAAC"}

package/dist/generators/docker/docker-compose/redis.d.ts CHANGED Viewed

@@ -1,8 +1,9 @@
 import type { DockerComposeOutput } from './types.js';
-interface PostgresConfig {
+interface RedisConfig {
     port: string;
     password: string;
+    projectName: string;
 }
-export declare function generateRedisDockerCompose(config: PostgresConfig): DockerComposeOutput;
+export declare function generateRedisDockerCompose(config: RedisConfig): DockerComposeOutput;
 export {};
 //# sourceMappingURL=redis.d.ts.map

package/dist/generators/docker/docker-compose/redis.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../../../src/generators/docker/docker-compose/redis.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,UAAU,~~cAAc~~;~~IACtB~~,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;~~CAClB~~;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,~~cAAc~~,~~GACrB~~,mBAAmB,~~CAmBrB~~"}
1	+ {"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../../../src/generators/docker/docker-compose/redis.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,WAAW,GAClB,mBAAmB,CA8BrB"}

package/dist/generators/docker/docker-compose/redis.js CHANGED Viewed

@@ -2,18 +2,29 @@ export function generateRedisDockerCompose(config) {
     return {
         services: [
             `  redis:
-    image: redis:7.2.4-alpine
+    image: redis:8.0-alpine
+    container_name: \${COMPOSE_PROJECT_NAME:-${config.projectName}}-redis
     restart: on-failure
+    security_opt:
+      - no-new-privileges:true
     ports:
       - "\${REDIS_PORT:-${config.port}}:6379"
-    command: redis-server -- save 20 1 --loglevel warning --requirepass ${config.password}
+    command: redis-server --save 20 1 --loglevel warning --requirepass \${REDIS_PASSWORD:-${config.password}} --maxmemory 256mb --maxmemory-policy noeviction
     volumes:
       - redis-cache:/data
+    networks:
+      - backend
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
     healthcheck:
-      test: [ "CMD", "redis-cli", "ping" ]
+      test: ["CMD", "redis-cli", "ping"]
       interval: 5s
       timeout: 2s
-      retries: 2`,
+      retries: 2
+      start_period: 10s`,
         ],
         volumes: ['  redis-cache:'],
     };

package/dist/generators/docker/docker-compose/redis.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../../src/generators/docker/docker-compose/redis.ts"],"names":[],"mappings":"~~AAOA~~,MAAM,UAAU,0BAA0B,CACxC,~~MAAsB~~;~~IAEtB~~,OAAO;QACL,QAAQ,EAAE;YACR~~;;;;0BAIoB~~,MAAM,CAAC,IAAI;~~0EACqC~~,MAAM,CAAC,QAAQ~~;;;;;;;iBAOxE~~;~~SACZ~~;QACD,OAAO,EAAE,CAAC,gBAAgB,CAAC;KAC5B,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../../src/generators/docker/docker-compose/redis.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,0BAA0B,CACxC,MAAmB;IAEnB,OAAO;QACL,QAAQ,EAAE;YACR;;+CAEyC,MAAM,CAAC,WAAW;;;;;0BAKvC,MAAM,CAAC,IAAI;4FACuD,MAAM,CAAC,QAAQ;;;;;;;;;;;;;;;wBAenF;SACnB;QACD,OAAO,EAAE,CAAC,gBAAgB,CAAC;KAC5B,CAAC;AACJ,CAAC"}

package/dist/generators/docker/docker-compose/types.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 export interface DockerComposeOutput {
     services: string[];
     volumes?: string[];
+    networks?: string[];
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/generators/docker/docker-compose/types.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/generators/docker/docker-compose/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;~~CACpB~~"}
1	+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/generators/docker/docker-compose/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB"}

package/dist/generators/node/eslint/react-rules.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"react-rules.d.ts","sourceRoot":"","sources":["../../../../src/generators/node/eslint/react-rules.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,kBAAkB,~~kDA2D9B~~,CAAC"}
1	+ {"version":3,"file":"react-rules.d.ts","sourceRoot":"","sources":["../../../../src/generators/node/eslint/react-rules.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,kBAAkB,kDAiE9B,CAAC"}

package/dist/generators/node/eslint/react-rules.js CHANGED Viewed

@@ -26,6 +26,14 @@ export const REACT_ESLINT_RULES = tsCodeFragment(`
         'error',
         { checksVoidReturn: { attributes: false } },
       ],
+      // Allow redirect and notFound to be thrown from routes
+      '@typescript-eslint/only-throw-error': [
+        'error',
+        {
+          allow: ['NotFoundError', 'Redirect'],
+        },
+      ],
     },
   },
@@ -40,8 +48,6 @@ export const REACT_ESLINT_RULES = tsCodeFragment(`
     rules: {
       // We use replace since it is not supported by ES2020
       'unicorn/prefer-string-replace-all': 'off',
-      // Allow PascalCase for React components
-      'unicorn/filename-case': 'off',
     },
   },
 `, [

package/dist/generators/node/eslint/react-rules.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"react-rules.js","sourceRoot":"","sources":["../../../../src/generators/node/eslint/react-rules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1E,MAAM,CAAC,MAAM,kBAAkB,GAAG,cAAc,CAC9C~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6CD~~,EACC;IACE,eAAe,EAAE;SACd,OAAO,CAAC,qBAAqB,CAAC;SAC9B,IAAI,CAAC,wBAAwB,CAAC;IACjC,eAAe,EAAE;SACd,OAAO,CAAC,oBAAoB,CAAC;SAC7B,IAAI,CAAC,wBAAwB,CAAC;IACjC,eAAe,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC;IACpE,eAAe,EAAE;SACd,OAAO,CAAC,kBAAkB,CAAC;SAC3B,IAAI,CAAC,2BAA2B,CAAC;CACrC,CACF,CAAC"}
1	+ {"version":3,"file":"react-rules.js","sourceRoot":"","sources":["../../../../src/generators/node/eslint/react-rules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1E,MAAM,CAAC,MAAM,kBAAkB,GAAG,cAAc,CAC9C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmDD,EACC;IACE,eAAe,EAAE;SACd,OAAO,CAAC,qBAAqB,CAAC;SAC9B,IAAI,CAAC,wBAAwB,CAAC;IACjC,eAAe,EAAE;SACd,OAAO,CAAC,oBAAoB,CAAC;SAC7B,IAAI,CAAC,wBAAwB,CAAC;IACjC,eAAe,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC;IACpE,eAAe,EAAE;SACd,OAAO,CAAC,kBAAkB,CAAC;SAC3B,IAAI,CAAC,2BAA2B,CAAC;CACrC,CACF,CAAC"}

package/dist/renderers/extractor/plugins/template-paths/paths-file.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"paths-file.d.ts","sourceRoot":"","sources":["../../../../../src/renderers/extractor/plugins/template-paths/paths-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAwBpE,eAAO,MAAM,yBAAyB,sBAAsB,CAAC;AA6C7D,UAAU,oBAAoB;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,uBAAuB,CACrC,aAAa,EAAE,MAAM,GACpB,oBAAoB,CAOtB;~~AA0HD~~,wBAAsB,gBAAgB,CACpC,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,wBAAwB,EACjC,OAAO,GAAE;IAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC7C,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAiDjC"}
1	+ {"version":3,"file":"paths-file.d.ts","sourceRoot":"","sources":["../../../../../src/renderers/extractor/plugins/template-paths/paths-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAwBpE,eAAO,MAAM,yBAAyB,sBAAsB,CAAC;AA6C7D,UAAU,oBAAoB;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,uBAAuB,CACrC,aAAa,EAAE,MAAM,GACpB,oBAAoB,CAOtB;AA2HD,wBAAsB,gBAAgB,CACpC,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,wBAAwB,EACjC,OAAO,GAAE;IAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC7C,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAiDjC"}

package/dist/renderers/extractor/plugins/template-paths/paths-file.js CHANGED Viewed

@@ -75,7 +75,8 @@ function createPathsTask(generatorName, pathMap, context, { providerExportName }
             variableName: camelCase(root.name),
             methodName: root.method,
         })),
-    }));
+    }))
+        .toSorted((a, b) => a.providerName.localeCompare(b.providerName));
     const dependencies = TsCodeUtils.mergeFragmentsAsObject(Object.fromEntries(pathProviders.map((p) => [
         p.providerVariableName,
         TsCodeUtils.importFragment(p.providerName, resolvePackagePathSpecifier(p.providerPathSpecifier, extractorConfig.packageName)),
@@ -129,9 +130,7 @@ export async function writePathMapFile(generatorName, pathMap, context, options
         templateContents: GENERATED_PATHS_TEMPLATE,
         variables: {
             TPL_PATHS_TYPE_NAME: interfaceName,
-            TPL_PATHS_CONTENTS: [...pathMap]
-                .map(([templateName]) => `'${templateName}': string`)
-                .join(',\n'),
+            TPL_PATHS_CONTENTS: TsCodeUtils.mergeFragmentsAsInterfaceContent(new Map([...pathMap].map(([templateName]) => [templateName, 'string']))),
             TPL_PATHS_PROVIDER_EXPORT: providerExportName,
             TPL_PATHS_PROVIDER_NAME: getGeneratedTemplateProviderName(generatorName, 'paths'),
             TPL_PATHS_TASK_DECLARATION: taskFragment

package/dist/renderers/extractor/plugins/template-paths/paths-file.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"paths-file.js","sourceRoot":"","sources":["../../../../../src/renderers/extractor/plugins/template-paths/paths-file.ts"],"names":[],"mappings":"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~~IAEN~~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~~;iBAC7B~~,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,~~IAAI~~,YAAY,~~WAAW~~,CAAC~~;iBACpD~~,~~IAAI~~,CAAC,~~KAAK,CAAC~~;~~YACd~~,yBAAyB,EAAE,kBAAkB;YAC7C,uBAAuB,EAAE,gCAAgC,CACvD,aAAa,EACb,OAAO,CACR;YACD,0BAA0B,EAAE,YAAY;gBACtC,CAAC,CAAC,WAAW,CAAC,mBAAmB,CAAC;oBAC9B,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAC3C,qBAAqB,CACtB;iBACF,CAAC,CAAA,SAAS,QAAQ,0BAA0B,YAAY,IAAI;gBAC/D,CAAC,CAAC,EAAE;YACN,qBAAqB,EAAE,YAAY,CAAC,CAAC,CAAC,SAAS,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE;YAC/D,qBAAqB,EAAE,eAAe,CAAC,cAAc;SACtD;QACD,OAAO,EAAE;YACP,iBAAiB,EAAE;gBACjB,gBAAgB,EAAE,CAAC,OAAO,CAAC;aAC5B;SACF;KACF,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAEpE,OAAO;QACL,UAAU,EAAE,eAAe,CAAC,cAAc;KAC3C,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"paths-file.js","sourceRoot":"","sources":["../../../../../src/renderers/extractor/plugins/template-paths/paths-file.ts"],"names":[],"mappings":"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"}

package/dist/renderers/extractor/plugins/template-paths/template-paths.plugin.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"template-paths.plugin.d.ts","sourceRoot":"","sources":["../../../../../src/renderers/extractor/plugins/template-paths/template-paths.plugin.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAW3F,MAAM,WAAW,gBAAgB;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB;AAQD,iBAAS,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAG7D;AAED,eAAO,MAAM,4BAA4B,yBAAyB,CAAC;AASnE;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB;4CA8BmB,MAAM,KAAG,MAAM;;+CAhB7C,MAAM,gBACP,MAAM,wBACE,MAAM,KAC3B,IAAI;~~wCAkCQ~~,mBAAmB,gBAClB,MAAM,gBACN,MAAM,iBACL,MAAM,KACpB;QACD,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;QACzC,qBAAqB,EAAE,MAAM,CAAC;KAC/B;;;;;SAmDH,CAAC;AAEH;;;;;GAKG;AACH,iBAAS,uCAAuC,CAC9C,oBAAoB,EAAE,MAAM,GAC3B,MAAM,CAIR"}
1	+ {"version":3,"file":"template-paths.plugin.d.ts","sourceRoot":"","sources":["../../../../../src/renderers/extractor/plugins/template-paths/template-paths.plugin.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAW3F,MAAM,WAAW,gBAAgB;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB;AAQD,iBAAS,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAG7D;AAED,eAAO,MAAM,4BAA4B,yBAAyB,CAAC;AASnE;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB;4CA8BmB,MAAM,KAAG,MAAM;;+CAhB7C,MAAM,gBACP,MAAM,wBACE,MAAM,KAC3B,IAAI;wCAuCQ,mBAAmB,gBAClB,MAAM,gBACN,MAAM,iBACL,MAAM,KACpB;QACD,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;QACzC,qBAAqB,EAAE,MAAM,CAAC;KAC/B;;;;;SAmDH,CAAC;AAEH;;;;;GAKG;AACH,iBAAS,uCAAuC,CAC9C,oBAAoB,EAAE,MAAM,GAC3B,MAAM,CAIR"}

package/dist/renderers/extractor/plugins/template-paths/template-paths.plugin.js CHANGED Viewed

@@ -34,7 +34,9 @@ export const templatePathsPlugin = createTemplateExtractorPlugin({
     pluginDependencies: [templateExtractorBarrelExportPlugin],
     getInstance: async ({ context, api }) => {
         const barrelExportPlugin = context.getPlugin(templateExtractorBarrelExportPlugin.name);
-        const templatePathRoots = await discoverTemplatePathRoots(context.outputDirectory);
+        const templatePathRoots = context.outputDirectory
+            ? await discoverTemplatePathRoots(context.outputDirectory)
+            : undefined;
         // Key: Generator name, Value: Map of template name to path root relative path
         const pathMapByGenerator = new Map();
         function registerTemplatePathEntry(generatorName, templateName, pathRootRelativePath) {
@@ -49,6 +51,9 @@ export const templatePathsPlugin = createTemplateExtractorPlugin({
          * @returns The relative path of the template file to the closest file path root.
          */
         function getPathRootRelativePath(absolutePath) {
+            if (!context.outputDirectory || !templatePathRoots) {
+                throw new Error('Template paths are not supported when running with metadata-only extraction');
+            }
             const outputRelativePath = path.relative(context.outputDirectory, absolutePath);
             return getTemplatePathFromRelativePath(outputRelativePath, templatePathRoots);
         }

package/dist/renderers/extractor/plugins/template-paths/template-paths.plugin.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"template-paths.plugin.js","sourceRoot":"","sources":["../../../../../src/renderers/extractor/plugins/template-paths/template-paths.plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,EAC7B,eAAe,GAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,uBAAuB,EACvB,SAAS,EACT,kBAAkB,GACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,EAAE,mCAAmC,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,gBAAgB,GACjB,MAAM,iBAAiB,CAAC;AAOzB,4DAA4D;AAC5D,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;CACzB,CAAC,CAAC;AAEH,SAAS,sBAAsB,CAAC,aAAqB;IACnD,MAAM,eAAe,GAAG,uBAAuB,CAAC,aAAa,CAAC,CAAC;IAC/D,OAAO,eAAe,CAAC,cAAc,CAAC;AACxC,CAAC;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,sBAAsB,CAAC;AAEnE,MAAM,+BAA+B,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/C;;OAEG;IACH,kBAAkB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;CAC/C,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,6BAA6B,CAAC;IAC/D,IAAI,EAAE,gBAAgB;IACtB,kBAAkB,EAAE,CAAC,mCAAmC,CAAC;IACzD,WAAW,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;QACtC,MAAM,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAC1C,mCAAmC,CAAC,IAAI,CACzC,CAAC;QACF,MAAM,iBAAiB,GAAG,MAAM,yBAAyB,~~CACvD~~,OAAO,CAAC,eAAe,~~CACxB~~,CAAC;~~QACF~~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"}
1	+ {"version":3,"file":"template-paths.plugin.js","sourceRoot":"","sources":["../../../../../src/renderers/extractor/plugins/template-paths/template-paths.plugin.ts"],"names":[],"mappings":"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"}

package/dist/renderers/extractor/plugins/typed-templates-file.js CHANGED Viewed

@@ -43,7 +43,7 @@ export const typedTemplatesFilePlugin = createTemplateExtractorPlugin({
                     templateContents: TS_TEMPLATE,
                     variables: {
                         TPL_TEMPLATE_FRAGMENTS: templatesFragment,
-                        TPL_TEMPLATE_EXPORTS: `{ ${templateExports.join(', ')} }`,
+                        TPL_TEMPLATE_EXPORTS: `{ ${templateExports.toSorted((a, b) => a.localeCompare(b)).join(', ')} }`,
                         TPL_EXPORT_NAME: exportName,
                     },
                     options: {

package/dist/renderers/extractor/plugins/typed-templates-file.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"typed-templates-file.js","sourceRoot":"","sources":["../../../../src/renderers/extractor/plugins/typed-templates-file.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,EAC7B,sCAAsC,GACvC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAIjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,gCAAgC,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,mCAAmC,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAEhF,MAAM,CAAC,MAAM,mCAAmC,GAAG,oBAAoB,CAAC;AAExE,MAAM,yBAAyB,GAAG,SAAS,CACzC,sCAAsC,EACtC,mCAAmC,CACpC,CAAC;AAOF,MAAM,WAAW,GAAG;;;;CAInB,CAAC;AAEF,MAAM,UAAU,+BAA+B,CAAC,aAAqB;IACnE,OAAO,gCAAgC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;AACtE,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,6BAA6B,CAAC;IACpE,IAAI,EAAE,sBAAsB;IAC5B,kBAAkB,EAAE;QAClB,mBAAmB;QACnB,mCAAmC;KACpC;IACD,WAAW,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;QAChC,MAAM,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAC1C,mCAAmC,CAAC,IAAI,CACzC,CAAC;QACF,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAG/B,CAAC;QAEJ,SAAS,WAAW,CAClB,aAAqB,EACrB,QAAwC;YAExC,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YAC9D,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzB,kBAAkB,CAAC,GAAG,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC;QAED,GAAG,CAAC,YAAY,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;YACxC,KAAK,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,IAAI,kBAAkB,EAAE,CAAC;gBAC5D,MAAM,eAAe,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gBAC3D,MAAM,iBAAiB,GAAG,WAAW,CAAC,cAAc,CAClD,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EACzD,MAAM,CACP,CAAC;gBACF,MAAM,UAAU,GAAG,+BAA+B,CAAC,aAAa,CAAC,CAAC;gBAClE,MAAM,oBAAoB,GAAG,wBAAwB,CAAC;oBACpD,gBAAgB,EAAE,WAAW;oBAC7B,SAAS,EAAE;wBACT,sBAAsB,EAAE,iBAAiB;wBACzC,oBAAoB,EAAE,KAAK,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;~~wBACzD~~,eAAe,EAAE,UAAU;qBAC5B;oBACD,OAAO,EAAE;wBACP,iBAAiB,EAAE;4BACjB,gBAAgB,EAAE,CAAC,OAAO,CAAC;yBAC5B;qBACF;iBACF,CAAC,CAAC;gBACH,MAAM,aAAa,GACjB,OAAO,CAAC,YAAY,CAAC,yBAAyB,CAC5C,aAAa,CACd,CAAC,kBAAkB,CAAC;gBACvB,MAAM,kBAAkB,GAAG,SAAS,CAClC,aAAa,EACb,yBAAyB,CAC1B,CAAC;gBACF,MAAM,OAAO,CAAC,aAAa,CAAC,SAAS,CACnC,kBAAkB,EAClB,oBAAoB,CACrB,CAAC;gBAEF,kBAAkB,CAAC,wBAAwB,CAAC,aAAa,EAAE;oBACzD,eAAe,EAAE,KAAK,uBAAuB,CAAC,mCAAmC,CAAC,EAAE;oBACpF,WAAW,EAAE,UAAU;oBACvB,IAAI,EAAE,WAAW;iBAClB,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,WAAW;SACZ,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
1	+ {"version":3,"file":"typed-templates-file.js","sourceRoot":"","sources":["../../../../src/renderers/extractor/plugins/typed-templates-file.ts"],"names":[],"mappings":"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"}

package/dist/renderers/extractor/utils/deduplicate-templates.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deduplicate-templates.d.ts","sourceRoot":"","sources":["../../../../src/renderers/extractor/utils/deduplicate-templates.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AAI3E;;;;;GAKG;AACH,wBAAgB,2CAA2C,CACzD,CAAC,SAAS,+BAA+B,EACzC,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,~~CAyBjB~~"}
1	+ {"version":3,"file":"deduplicate-templates.d.ts","sourceRoot":"","sources":["../../../../src/renderers/extractor/utils/deduplicate-templates.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AAI3E;;;;;GAKG;AACH,wBAAgB,2CAA2C,CACzD,CAAC,SAAS,+BAA+B,EACzC,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CA0BjB"}

package/dist/renderers/extractor/utils/deduplicate-templates.js CHANGED Viewed

@@ -9,10 +9,11 @@ export function deduplicateTemplateFileExtractorSourceFiles(files) {
     const deduplicatedList = [];
     // Sort by modified time to ensure the latest version is used
     for (const file of files.toSorted((a, b) => b.modifiedTime.getTime() - a.modifiedTime.getTime())) {
-        const fileKey = `${file.metadata.generator}__${file.metadata.name}`;
+        const fileKey = `${file.generatorName}__${file.templateName}`;
         if (addedTemplates.has(fileKey)) {
-            if ('fileOptions' in file.metadata &&
-                file.metadata.fileOptions.kind === 'singleton') {
+            if ('fileOptions' in file.existingMetadata &&
+                file.existingMetadata.fileOptions.kind ===
+                    'singleton') {
                 throw new Error(`Duplicate singleton template found: ${fileKey}`);
             }
             else {

package/dist/renderers/extractor/utils/deduplicate-templates.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deduplicate-templates.js","sourceRoot":"","sources":["../../../../src/renderers/extractor/utils/deduplicate-templates.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,MAAM,UAAU,2CAA2C,CAEzD,KAAU;IACV,MAAM,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;IACjC,MAAM,gBAAgB,GAAQ,EAAE,CAAC;IAEjC,6DAA6D;IAC7D,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,QAAQ,CAC/B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAC9D,EAAE,CAAC;QACF,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,~~QAAQ~~,~~CAAC,SAAS,~~KAAK,IAAI,CAAC,~~QAAQ~~,~~CAAC,IAAI,~~EAAE,CAAC;~~QACpE~~,IAAI,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,IACE,aAAa,IAAI,IAAI,CAAC,~~QAAQ~~;~~gBAC7B~~,IAAI,CAAC,~~QAAQ~~,CAAC,WAAmC,CAAC,IAAI,~~KAAK,~~WAAW,~~EACvE~~,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,uCAAuC,OAAO,EAAE,CAAC,CAAC;YACpE,CAAC;iBAAM,CAAC;gBACN,kDAAkD;gBAClD,SAAS;YACX,CAAC;QACH,CAAC;QACD,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC5B,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
1	+ {"version":3,"file":"deduplicate-templates.js","sourceRoot":"","sources":["../../../../src/renderers/extractor/utils/deduplicate-templates.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,MAAM,UAAU,2CAA2C,CAEzD,KAAU;IACV,MAAM,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;IACjC,MAAM,gBAAgB,GAAQ,EAAE,CAAC;IAEjC,6DAA6D;IAC7D,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,QAAQ,CAC/B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAC9D,EAAE,CAAC;QACF,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;QAC9D,IAAI,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,IACE,aAAa,IAAI,IAAI,CAAC,gBAAgB;gBACrC,IAAI,CAAC,gBAAgB,CAAC,WAAmC,CAAC,IAAI;oBAC7D,WAAW,EACb,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,uCAAuC,OAAO,EAAE,CAAC,CAAC;YACpE,CAAC;iBAAM,CAAC;gBACN,kDAAkD;gBAClD,SAAS;YACX,CAAC;QACH,CAAC;QACD,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC5B,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}

package/dist/renderers/raw/index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
 export * from './render-raw-template-action.js';
+export * from './render-raw-template-renderers.js';
 export * from './types.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/renderers/raw/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/renderers/raw/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,YAAY,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/renderers/raw/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,YAAY,CAAC"}

package/dist/renderers/raw/index.js CHANGED Viewed

@@ -1,3 +1,4 @@
 export * from './render-raw-template-action.js';
+export * from './render-raw-template-renderers.js';
 export * from './types.js';
 //# sourceMappingURL=index.js.map

package/dist/renderers/raw/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/renderers/raw/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,YAAY,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/renderers/raw/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,YAAY,CAAC"}

package/dist/renderers/raw/raw-template-file-extractor.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 export declare const RawTemplateFileExtractor: import("@baseplate-dev/sync").TemplateFileExtractor<import("zod").ZodObject<import("zod").objectUtil.extendShape<{
-    name: import("zod").ZodString;
+    sourceFile: import("zod").ZodString;
     type: import("zod").ZodString;
 }, {
     fileOptions: import("zod").ZodDefault<import("zod").ZodDiscriminatedUnion<"kind", [import("zod").ZodObject<{
@@ -26,7 +26,7 @@ export declare const RawTemplateFileExtractor: import("@baseplate-dev/sync").Tem
     }>]>>;
     pathRootRelativePath: import("zod").ZodOptional<import("zod").ZodString>;
 }>, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<import("zod").objectUtil.extendShape<{
-    name: import("zod").ZodString;
+    sourceFile: import("zod").ZodString;
     type: import("zod").ZodString;
 }, {
     fileOptions: import("zod").ZodDefault<import("zod").ZodDiscriminatedUnion<"kind", [import("zod").ZodObject<{
@@ -53,7 +53,7 @@ export declare const RawTemplateFileExtractor: import("@baseplate-dev/sync").Tem
     }>]>>;
     pathRootRelativePath: import("zod").ZodOptional<import("zod").ZodString>;
 }>, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<import("zod").objectUtil.extendShape<{
-    name: import("zod").ZodString;
+    sourceFile: import("zod").ZodString;
     type: import("zod").ZodString;
 }, {
     fileOptions: import("zod").ZodDefault<import("zod").ZodDiscriminatedUnion<"kind", [import("zod").ZodObject<{
@@ -79,59 +79,7 @@ export declare const RawTemplateFileExtractor: import("@baseplate-dev/sync").Tem
         generatorTemplatePath: string;
     }>]>>;
     pathRootRelativePath: import("zod").ZodOptional<import("zod").ZodString>;
-}>, import("zod").ZodTypeAny, "passthrough">>, import("zod").ZodObject<import("zod").objectUtil.extendShape<{
-    name: import("zod").ZodString;
-    type: import("zod").ZodString;
-    generator: import("zod").ZodString;
-}, {
-    type: import("zod").ZodLiteral<"raw">;
-    fileOptions: import("zod").ZodDefault<import("zod").ZodDiscriminatedUnion<"kind", [import("zod").ZodObject<{
-        kind: import("zod").ZodDefault<import("zod").ZodOptional<import("zod").ZodLiteral<"singleton">>>;
-        generatorTemplatePath: import("zod").ZodOptional<import("zod").ZodString>;
-        pathRootRelativePath: import("zod").ZodOptional<import("zod").ZodString>;
-    }, "strip", import("zod").ZodTypeAny, {
-        kind: "singleton";
-        generatorTemplatePath?: string | undefined;
-        pathRootRelativePath?: string | undefined;
-    }, {
-        kind?: "singleton" | undefined;
-        generatorTemplatePath?: string | undefined;
-        pathRootRelativePath?: string | undefined;
-    }>, import("zod").ZodObject<{
-        kind: import("zod").ZodLiteral<"instance">;
-        generatorTemplatePath: import("zod").ZodString;
-    }, "strip", import("zod").ZodTypeAny, {
-        kind: "instance";
-        generatorTemplatePath: string;
-    }, {
-        kind: "instance";
-        generatorTemplatePath: string;
-    }>]>>;
-}>, "strip", import("zod").ZodTypeAny, {
-    type: "raw";
-    name: string;
-    fileOptions: {
-        kind: "singleton";
-        generatorTemplatePath?: string | undefined;
-        pathRootRelativePath?: string | undefined;
-    } | {
-        kind: "instance";
-        generatorTemplatePath: string;
-    };
-    generator: string;
-}, {
-    type: "raw";
-    name: string;
-    generator: string;
-    fileOptions?: {
-        kind?: "singleton" | undefined;
-        generatorTemplatePath?: string | undefined;
-        pathRootRelativePath?: string | undefined;
-    } | {
-        kind: "instance";
-        generatorTemplatePath: string;
-    } | undefined;
-}>, import("zod").ZodUnknown, (import("@baseplate-dev/sync").TemplateExtractorPlugin<"template-paths", {
+}>, import("zod").ZodTypeAny, "passthrough">>, import("zod").AnyZodObject, import("zod").ZodUnknown, (import("@baseplate-dev/sync").TemplateExtractorPlugin<"template-paths", {
     getPathRootRelativePath: (absolutePath: string) => string;
     getTemplatePathFromPathRootRelativePath: (pathRootRelativePath: string) => string;
     registerTemplatePathEntry: (generatorName: string, templateName: string, pathRootRelativePath: string) => void;
@@ -160,5 +108,10 @@ export declare const RawTemplateFileExtractor: import("@baseplate-dev/sync").Tem
 }, import("@baseplate-dev/sync").TemplateExtractorPlugin<"barrel-export", {
     addBarrelExport: (generatorName: string, barrelExport: import("../extractors.js").TemplateExtractorBarrelExport) => void;
     addGeneratedBarrelExport: (generatorName: string, generatedBarrelExport: import("../extractors.js").TemplateExtractorGeneratedBarrelExport) => void;
-}, []>[]>)[]>)[], unknown>;
+}, []>[]>)[]> | import("@baseplate-dev/sync").TemplateExtractorPlugin<"template-renderers", {
+    addTemplateRenderer: (generatorName: string, rendererEntry: import("../extractor/plugins/template-renderers/types.js").TemplateRendererEntry) => void;
+}, import("@baseplate-dev/sync").TemplateExtractorPlugin<"barrel-export", {
+    addBarrelExport: (generatorName: string, barrelExport: import("../extractors.js").TemplateExtractorBarrelExport) => void;
+    addGeneratedBarrelExport: (generatorName: string, generatedBarrelExport: import("../extractors.js").TemplateExtractorGeneratedBarrelExport) => void;
+}, []>[]>)[]>;
 //# sourceMappingURL=raw-template-file-extractor.d.ts.map

package/dist/renderers/raw/raw-template-file-extractor.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"raw-template-file-extractor.d.ts","sourceRoot":"","sources":["../../../src/renderers/raw/raw-template-file-extractor.ts"],"names":[],"mappings":"~~AAmBA~~,eAAO,MAAM,wBAAwB~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BA0GnC~~,CAAC"}
1	+ {"version":3,"file":"raw-template-file-extractor.d.ts","sourceRoot":"","sources":["../../../src/renderers/raw/raw-template-file-extractor.ts"],"names":[],"mappings":"AAsBA,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA+HnC,CAAC"}