@postxl/generator 0.52.0 → 0.53.0

package/dist/generator.js

@@ -77,7 +77,6 @@ const stub_generator_1 = require("./generators/models/stub.generator");
 const types_generator_3 = require("./generators/models/types.generator");
 const meta_1 = require("./lib/meta");
 const types_1 = require("./lib/schema/types");
-const skip_generator_1 = require("./lib/skip-generator");
 const vfs_1 = require("./lib/vfs");
 const client_path_1 = require("./prisma/client-path");
 const parse_1 = require("./prisma/parse");
@@ -168,9 +167,7 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
             // Types
             generated.write(`/${meta.types.filePath}.ts`, (0, types_generator_3.generateModelTypes)({ model, meta }));
             // Seed
-            if (!(0, skip_generator_1.skipDecoder)({ model, generatorName: 'seed' })) {
-                generated.write(`/${meta.seed.filePath}.ts`, (0, seed_generator_1.generateSeedModel)({ model, itemCount: 5, meta, models }));
-            }
+            generated.write(`/${meta.seed.filePath}.ts`, (0, seed_generator_1.generateSeedModel)({ model, itemCount: 5, meta, models }));
             // Data
             generated.write(`/${meta.data.stubFilePath}.ts`, (0, stub_generator_1.generateStub)({ model, meta }));
             generated.write(`/${meta.data.repository.filePath}.ts`, (0, repository_generator_1.generateRepository)({ model, meta }));
@@ -184,15 +181,8 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
             // Routes
             generated.write(`/${meta.trpc.routerFilePath}.ts`, (0, route_generator_1.generateRoute)({ model, meta }));
             // React
-            if (!(0, skip_generator_1.skipDecoder)({ model, generatorName: 'react' })) {
-                yield generated.copy((0, react_generator_2.generateReactComponentsForModel)({ model, meta }), meta.react.folderPath);
-            }
-            if (model.attributes.skipGenerators.size === 0) {
-                logger.log(`- ${model.name} processed`);
-            }
-            else {
-                logger.log(`- ${model.name} processed (skipped generators for: ${[...model.attributes.skipGenerators].join(', ')})`);
-            }
+            yield generated.copy((0, react_generator_2.generateReactComponentsForModel)({ model, meta }), meta.react.folderPath);
+            logger.log(`- ${model.name} processed`);
         }
         // Generate Enums
         for (const enumerator of enums.values()) {

package/dist/generators/indices/seed-migration.generator.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSeedMigration = void 0;
 const imports_1 = require("../../lib/imports");
 const meta_1 = require("../../lib/meta");
-const skip_generator_1 = require("../../lib/skip-generator");
 /**
  * Generates the initial migration based on the generated seed data.
  */
@@ -11,9 +10,6 @@ function generateSeedMigration({ models, meta }) {
     const imports = imports_1.ImportsGenerator.from(meta.seedData.initialMigrationFilePath);
     const modelTypes = [];
     for (const model of models) {
-        if ((0, skip_generator_1.skipDecoder)({ model, generatorName: 'seed' })) {
-            continue;
-        }
         const modelMeta = (0, meta_1.getModelMetadata)({ model });
         imports.addImports({
             [modelMeta.seed.filePath]: [modelMeta.seed.constantName],

package/dist/generators/indices/testdata-service.generator.js

@@ -47,11 +47,14 @@ export class TestDataService {
   ) {}
 
   public async resetTestData(data: MockData) {
+    this.logger.log('💥 Emptying test data')
     await this.db.WIPE_ENTIRE_DATABASE()
 
     // We need to init the user repository first so the root user is created
     await this.dataService.users.init()
 
+    this.logger.log('✍ Setting test data')
+
     const mockData = ${schemaMeta.importExport.converterFunctions.mockDataToBulkMutations}(data)
     const action = createActionSeedData({ name: 'E2E', order: 0, data: [] })
     const actionExecution = await this.actionExecutionFactory.create({
@@ -63,7 +66,7 @@ export class TestDataService {
       ${reInitCalls.join('\n')}
       
       await actionExecution.success()
-      this.logger.log(\`✅ Reset test data\`)
+      this.logger.log('✅ Reset test data')
     } catch (e) {
       await actionExecution.error(e)
       throw e

package/dist/generators/models/businesslogic-update.generator.js

@@ -17,6 +17,7 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
         [meta.data.importPath]: meta.data.repository.className,
         [schemaMeta.actions.importPath]: schemaMeta.actions.actionExecution.interface,
         [meta.types.importPath]: [(0, types_1.toAnnotatedTypeName)(model.brandedIdType), (0, types_1.toAnnotatedTypeName)(meta.types.typeName)],
+        [meta.businessLogic.view.serviceFilePath]: [meta.businessLogic.view.serviceClassName],
         [schemaMeta.businessLogic.update.serviceFilePath]: schemaMeta.businessLogic.update.serviceClassName,
         [schemaMeta.businessLogic.view.serviceFilePath]: schemaMeta.businessLogic.view.serviceClassName,
         [meta.data.importPath]: [meta.data.repository.className],
@@ -56,7 +57,15 @@ ${actionBlocks.typeDefinitionWithCreateFunction}
 
 @Injectable()
 export class ${meta.businessLogic.update.serviceClassName} {
-  constructor(${constructorParameters.join(',\n')}) {}
+  
+  /**
+   * Instance of the ${meta.userFriendlyName} view service for convenience.
+   */
+  private view: ${meta.businessLogic.view.serviceClassName}
+
+  constructor(${constructorParameters.join(',\n')}) {
+    this.view = this.${viewServiceClassName}.${meta.businessLogic.view.serviceVariableName}
+  }
 
   ${actionBlocks.dispatcher}
   

package/dist/generators/models/types.generator.js

@@ -131,7 +131,7 @@ export type ${meta.types.dto.create} = ${schemaMeta.types.dto.create}<${meta.typ
 export type ${meta.types.dto.update} = ${schemaMeta.types.dto.update}<${meta.types.typeName}, ${model.brandedIdType}>
 
 /**
- * Data transfer object for upserting an existing ${meta.userFriendlyName} instance.
+ * Data transfer object for upserting a new or existing ${meta.userFriendlyName} instance.
  */
 export type ${meta.types.dto.upsert} = ${schemaMeta.types.dto.upsert}<${meta.types.typeName}, ${model.brandedIdType}>
 `;

package/dist/lib/attributes.d.ts

@@ -1,4 +1,3 @@
-import { GeneratorName } from './skip-generator';
 export type AttributeValue = unknown;
 export type Attributes = Record<string, AttributeValue>;
 export type ModelAttributes = {
@@ -37,11 +36,6 @@ export type ModelAttributes = {
      * The user that is used for system actions.
      */
     systemUser?: object;
-    /**
-     * Set of generators that should be skipped for this model.
-     * Schema tag: ´@@Skip("seed", "react")`
-     */
-    skipGenerators: Set<GeneratorName>;
 };
 export type FieldAttributes = {
     /**

package/dist/prisma/attributes.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFieldAttributes = exports.getEnumAttributes = exports.getModelAttributes = exports.parseArgumentToStringOrStringArray = exports.parseAttributesFromDocumentation = void 0;
 const zod_1 = __importDefault(require("zod"));
-const skip_generator_1 = require("../lib/skip-generator");
 const string_1 = require("../lib/utils/string");
 /**
  * Parses attributes from a given string using provided prefix.
@@ -75,7 +74,6 @@ function getModelAttributes(model) {
         schema: zod_1.default.string().optional(),
         index: zod_1.default.array(zod_1.default.string()).optional(),
         seed: zod_1.default.string().optional(),
-        skip: skip_generator_1.skipAttributeDecoder,
         systemUser: zod_1.default
             .string()
             .transform((t) => JSON.parse(t))
@@ -87,7 +85,6 @@ function getModelAttributes(model) {
         description: obj.description,
         databaseSchema: obj.schema,
         index: obj.index,
-        skipGenerators: obj.skip,
         systemUser: obj.systemUser,
         randomSeed: obj.seed !== undefined ? parseInt(obj.seed, 10) : undefined,
     }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.52.0",
+  "version": "0.53.0",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {

package/dist/lib/skip-generator.d.ts

@@ -1,18 +0,0 @@
-import * as z from 'zod';
-import { ModelCore } from './schema/schema';
-/**
- * Identifiers of generators that can be skipped.
- */
-export type GeneratorName = 'seed' | 'react';
-/**
- * Decoder to convert a list of generator names to a Set of generator names.
- */
-export declare const skipAttributeDecoder: z.ZodEffects<z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"seed">, z.ZodLiteral<"react">]>, "many">>, Set<"seed" | "react">, ("seed" | "react")[] | undefined>;
-export type SkipAttribute = z.infer<typeof skipAttributeDecoder>;
-/**
- * Returns true if the given generator should be skipped.
- */
-export declare function skipDecoder({ model, generatorName }: {
-    model: ModelCore;
-    generatorName: GeneratorName;
-}): boolean;

package/dist/lib/skip-generator.js

@@ -1,41 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.skipDecoder = exports.skipAttributeDecoder = void 0;
-const z = __importStar(require("zod"));
-/**
- * Decoder to convert a list of generator names to a Set of generator names.
- */
-exports.skipAttributeDecoder = z
-    .array(z.union([z.literal('seed'), z.literal('react')]))
-    .optional()
-    .transform((t) => new Set(t));
-/**
- * Returns true if the given generator should be skipped.
- */
-function skipDecoder({ model, generatorName }) {
-    return model.attributes.skipGenerators.has(generatorName);
-}
-exports.skipDecoder = skipDecoder;