@postxl/generator 0.16.0 → 0.16.2

package/dist/generators/enums/react.generator.js

@@ -21,7 +21,7 @@ exports.generateEnumReactComponents = generateEnumReactComponents;
  */
 function generateEnumSelect({ enumerator, meta }) {
     const imports = imports_1.ImportsGenerator.from(meta.react.folderPath).addImport({
-        items: [enumerator.typeName],
+        items: [enumerator.tsTypeName],
         from: meta.types.importPath,
     });
     return `
@@ -35,7 +35,7 @@ import { UnionOmit } from '@lib/types'
 ${imports.generate()}
 
 type Option = {
-	id: ${enumerator.typeName}
+	id: ${enumerator.tsTypeName}
 	label: string
 }
 
@@ -46,7 +46,7 @@ const OPTIONS: Option[] = [
 // Switcher
 
 export const ${meta.react.switcherInputName} = ({ ...delegated }: UnionOmit<
-  React.ComponentPropsWithoutRef<typeof ButtonSwitcher<${enumerator.typeName}>>, 
+  React.ComponentPropsWithoutRef<typeof ButtonSwitcher<${enumerator.tsTypeName}>>, 
   'options'
 >) => (
 	<ButtonSwitcher options={OPTIONS} {...delegated} />

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

@@ -8,15 +8,15 @@ function generateEnumType({ enumerator, meta, prismaClientPath, }) {
     return `
     import * as Prisma from '${prismaClientPath}'
 
-    export type ${enumerator.typeName} = Prisma.${enumerator.sourceName}
-    export const ${enumerator.typeName} = Prisma.${enumerator.sourceName}
+    export type ${enumerator.tsTypeName} = Prisma.${enumerator.sourceName}
+    export const ${enumerator.tsTypeName} = Prisma.${enumerator.sourceName}
     ${enumerator.description
         ? `/**
       * ${enumerator.description.split('\n').join('\n * ')} 
       */
      `
         : ''}
-    export const ${meta.types.membersList}: ${enumerator.typeName}[] = [
+    export const ${meta.types.membersList}: ${enumerator.tsTypeName}[] = [
       ${enumerator.values
         .map((v) => {
         var _a;

package/dist/generators/indices/seed-template-decoder.generator.js

@@ -42,12 +42,10 @@ function generateTableDecoder({ model, meta, imports, }) {
         renameTransforms.push(`${field.name}: item['${fieldMeta.excelColumnName}']`);
         switch (field.kind) {
             case 'id': {
-                imports.addImport({
-                    items: [meta.types.toBrandedIdTypeFnName],
-                    from: meta.types.importPath,
-                });
+                imports.addImport({ items: [meta.types.toBrandedIdTypeFnName], from: meta.types.importPath });
                 fieldDecoders.push(`${fieldMeta.excelColumnName}: ${toExcelDecoder({
-                    typeName: field.unbrandedTypeName,
+                    tsTypeName: field.unbrandedTypeName,
+                    dbTypeName: field.type,
                     nullable: false,
                     imports,
                 })}.transform((id: ${field.unbrandedTypeName}) => ${meta.types.toBrandedIdTypeFnName}(id))`);
@@ -55,7 +53,8 @@ function generateTableDecoder({ model, meta, imports, }) {
             }
             case 'scalar': {
                 fieldDecoders.push(`${fieldMeta.excelColumnName}: ${toExcelDecoder({
-                    typeName: field.typeName,
+                    tsTypeName: field.tsTypeName,
+                    dbTypeName: field.type,
                     nullable: !field.isRequired,
                     imports,
                 })}`);
@@ -64,12 +63,10 @@ function generateTableDecoder({ model, meta, imports, }) {
             case 'relation': {
                 const refModel = field.relationToModel;
                 const refMeta = (0, meta_1.getModelMetadata)({ model: refModel });
-                imports.addImport({
-                    items: [refMeta.types.toBrandedIdTypeFnName],
-                    from: refMeta.types.importPath,
-                });
+                imports.addImport({ items: [refMeta.types.toBrandedIdTypeFnName], from: refMeta.types.importPath });
                 fieldDecoders.push(`${fieldMeta.excelColumnName}: ${toExcelDecoder({
-                    typeName: field.unbrandedTypeName,
+                    tsTypeName: field.unbrandedTypeName,
+                    dbTypeName: field.type,
                     nullable: !field.isRequired,
                     imports,
                 })}.transform((id: ${field.unbrandedTypeName}${field.isRequired ? '' : '| null'}) => ${field.isRequired ? '' : ' id === null ? null : '}${refMeta.types.toBrandedIdTypeFnName}(id))`);
@@ -77,10 +74,7 @@ function generateTableDecoder({ model, meta, imports, }) {
             }
             case 'enum': {
                 const refEnumMeta = (0, meta_1.getEnumMetadata)({ enumerator: field.enumerator });
-                imports.addImport({
-                    items: [field.enumerator.typeName],
-                    from: refEnumMeta.types.importPath,
-                });
+                imports.addImport({ items: [field.enumerator.tsTypeName], from: refEnumMeta.types.importPath });
                 fieldDecoders.push(`${fieldMeta.excelColumnName}: z.enum([${field.enumerator.values.map((v) => `'${v}'`).join(', ')}])${field.isRequired ? '' : '.nullable()'}`);
                 break;
             }
@@ -105,8 +99,8 @@ export type ${meta.seed.decoder.decoderTypeName} = z.infer<typeof ${meta.seed.de
 export const ${meta.seed.decoder.decoderName} = z.array(${meta.seed.decoder.schemaName})
 `;
 }
-function toExcelDecoder({ typeName, nullable, imports, }) {
-    switch (typeName) {
+function toExcelDecoder({ tsTypeName, dbTypeName: typeName, nullable, imports, }) {
+    switch (tsTypeName) {
         case 'string': {
             const decoder = (0, types_1.toFunction)(nullable ? 'excelStringNullableDecoder' : 'excelStringDecoder');
             imports.addImport({
@@ -122,7 +116,13 @@ function toExcelDecoder({ typeName, nullable, imports, }) {
             });
             return 'excelBooleanDecoder';
         case 'number':
-            return `z.number()${nullable ? '.nullable()' : ''}`;
+            switch (typeName) {
+                case 'Int':
+                case 'BigInt':
+                    return `z.number().int()${nullable ? '.nullable()' : ''}`;
+                default:
+                    return `z.number()${nullable ? '.nullable()' : ''}`;
+            }
         case 'Date': {
             const decoder = (0, types_1.toFunction)(nullable ? 'excelDateNullableDecoder' : 'excelDateDecoder');
             imports.addImport({

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

@@ -41,7 +41,7 @@ function generateModelBusinessLogic({ model, meta }) {
      * (e.g. when we generate business logic service for Aggregation, the AggregationRepository
      * would be referenced using `this.data` variable).
      */
-    const modelRepositoryVariableName = Types.toVariableName('data');
+    const modelRepositoryVariableName = meta.businessLogic.dataRepositoryVariableName;
     /**
      * The name of the variable that holds the central business logic service instance.
      * Instead of injecting a repository instance for each model, we inject this single instance

package/dist/generators/models/react.generator/modals.generator.js

@@ -312,7 +312,7 @@ function getFormImports({ model, meta }) {
     for (const f of (0, fields_1.getEnumFields)(model)) {
         const enumMeta = (0, meta_1.getEnumMetadata)(f);
         imports.addImport({
-            items: [f.enumerator.typeName],
+            items: [f.enumerator.tsTypeName],
             from: enumMeta.types.importPath,
         });
         imports.addImport({
@@ -351,7 +351,7 @@ function getCreateFormInputFields({ model }) {
                 form.append(`${getFormikFieldName(field.name)}: { id: ${field.relationToModel.brandedIdType} } | null`);
                 break;
             case 'scalar':
-                form.append(`${getFormikFieldName(field.name)}: ${field.typeName} | null`);
+                form.append(`${getFormikFieldName(field.name)}: ${field.tsTypeName} | null`);
                 break;
             case 'enum':
                 form.append(`${getFormikFieldName(field.name)}: { id: ${field.typeName} } | null`);
@@ -424,10 +424,10 @@ function getEditFormInputFields({ model }) {
                 break;
             case 'scalar':
                 if (field.isRequired) {
-                    form.append(`${getFormikFieldName(field.name)}: ${field.typeName}`);
+                    form.append(`${getFormikFieldName(field.name)}: ${field.tsTypeName}`);
                 }
                 else {
-                    form.append(`${getFormikFieldName(field.name)}: ${field.typeName} | null`);
+                    form.append(`${getFormikFieldName(field.name)}: ${field.tsTypeName} | null`);
                 }
                 break;
             case 'enum':
@@ -486,7 +486,7 @@ function getFormFieldComponents({ model }) {
             }
             case 'scalar': {
                 // Each scalar field has a different generic component based on the provided type.
-                scalar: switch (field.typeName) {
+                scalar: switch (field.tsTypeName) {
                     case 'string': {
                         form.append(`
               <div>
@@ -523,7 +523,7 @@ function getFormFieldComponents({ model }) {
                         break scalar;
                     }
                     default: {
-                        console.warn(`Unknown scalar type ${field.typeName} for field ${model.name}.${field.name}.`);
+                        console.warn(`Unknown scalar type ${field.tsTypeName} for field ${model.name}.${field.name}.`);
                         break scalar;
                     }
                 }

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

@@ -11,7 +11,7 @@ const imports_1 = require("../../lib/imports");
 function generateRoute({ model, meta }) {
     const { idField, defaultField } = model;
     const defaultValueMethod = `
-    getDefault: procedure.query(({ ctx }) => ctx.data.${meta.data.dataServiceName}.defaultValue),
+    getDefault: procedure.query(({ ctx }) => ctx.data.${meta.data.dataServiceName}.${meta.businessLogic.dataRepositoryVariableName}.defaultValue),
   `;
     const createMethod = getCreateMethod({ model, meta });
     const updateMethod = getUpdateMethod({ model, meta });

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

@@ -113,7 +113,7 @@ function quoteSingleQuote(str) {
 }
 function generateScalarFieldExample({ field, model, index, mode, }) {
     const { hasExample, example } = generateFieldExample({ field, model, index, mode });
-    switch (field.typeName) {
+    switch (field.tsTypeName) {
         case 'string': {
             if (hasExample && typeof example === 'string') {
                 return `'${quoteSingleQuote(example)}'`;
@@ -131,7 +131,13 @@ function generateScalarFieldExample({ field, model, index, mode, }) {
             if (hasExample) {
                 return `${example}`;
             }
-            return generateMockNumber();
+            switch (field.type) {
+                case 'BigInt':
+                case 'Int':
+                    return generateMockInteger();
+                default:
+                    return generateMockNumber();
+            }
         }
         case 'boolean': {
             if (hasExample) {
@@ -147,7 +153,7 @@ function generateScalarFieldExample({ field, model, index, mode, }) {
             return generateMockDate();
         }
         default: {
-            console.warn(`Unknown scalar type: ${field.typeName}`);
+            console.warn(`Unknown scalar type: ${field.tsTypeName}`);
             return '';
         }
     }
@@ -182,6 +188,9 @@ function generateMockString({ field, model, index }) {
     }
     return faker_1.faker.lorem.words(3);
 }
+function generateMockInteger() {
+    return faker_1.faker.datatype.number({ precision: 1, min: 1, max: 1000 }).toString();
+}
 function generateMockNumber() {
     return faker_1.faker.datatype.float({ precision: 0.1, min: 0, max: 1 }).toString();
 }

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

@@ -48,7 +48,7 @@ function getAssignmentStatementModel({ fields, imports }) {
         }
         switch (f.kind) {
             case 'scalar': {
-                return `${f.name}: ${(0, fields_1.getDefaultValueForType)(f.typeName)}`;
+                return `${f.name}: ${(0, fields_1.getDefaultValueForType)(f.tsTypeName)}`;
             }
             case 'id': {
                 const idRefMeta = (0, meta_1.getModelMetadata)({ model: f.model });

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

@@ -28,7 +28,7 @@ function generateModelTypes({ model, meta }) {
     for (const f of (0, fields_1.getEnumFields)(model)) {
         const refEnumMeta = (0, meta_1.getEnumMetadata)({ enumerator: f.enumerator });
         imports.addImport({
-            items: [f.enumerator.typeName],
+            items: [f.enumerator.tsTypeName],
             from: refEnumMeta.types.filePath,
         });
     }
@@ -123,7 +123,7 @@ function getFieldType(f) {
         case 'id':
             return f.model.brandedIdType;
         case 'scalar':
-            return f.typeName;
+            return f.tsTypeName;
         default:
             throw new types_1.ExhaustiveSwitchCheck(f);
     }
@@ -140,7 +140,7 @@ function getLinkedFieldType(f) {
         case 'id':
             return `${f.name}: ${f.model.brandedIdType}`;
         case 'scalar':
-            return `${f.name}: ${f.typeName}`;
+            return `${f.name}: ${f.tsTypeName}`;
         default:
             throw new types_1.ExhaustiveSwitchCheck(f);
     }

package/dist/lib/meta.d.ts

@@ -245,6 +245,10 @@ export type ModelMetaData = {
          * Path to the file containing the service.
          */
         serviceFilePath: Types.Path;
+        /**
+         * Name by which the business logic service exposes the data service.
+         */
+        dataRepositoryVariableName: Types.VariableName;
     };
     /**
      * Properties provided by the `seed` generators.

package/dist/lib/meta.js

@@ -105,6 +105,7 @@ function getModelMetadata({ model }) {
             serviceVariableName: Types.toVariableName(`${uncapitalizedPlural}`),
             serviceFileName: Types.toFileName(`${camelCase}.service`),
             serviceFilePath: Types.toPath(`${config.paths.businessLogicPath}${camelCase}.service`),
+            dataRepositoryVariableName: Types.toVariableName(`data`),
         },
         seed: {
             filePath: Types.toPath(`${config.paths.seedPath}${uncapitalizedPlural}`),

package/dist/lib/schema/fields.js

@@ -45,11 +45,11 @@ exports.getDefaultValueForType = getDefaultValueForType;
  * Returns true if the given field is unique and a string field.
  */
 const isUniqueStringField = (f) => (f.kind === 'id' && f.isUnique && f.unbrandedTypeName === 'string') ||
-    (f.kind === 'scalar' && f.isUnique && f.typeName === 'string');
+    (f.kind === 'scalar' && f.isUnique && f.tsTypeName === 'string');
 exports.isUniqueStringField = isUniqueStringField;
 /**
  * Returns true if the given field has a maxLength attribute.
  */
 const isMaxLengthStringField = (f) => (f.kind === 'id' && !!f.attributes.maxLength && f.unbrandedTypeName === 'string') ||
-    (f.kind === 'scalar' && !!f.attributes.maxLength && f.typeName === 'string');
+    (f.kind === 'scalar' && !!f.attributes.maxLength && f.tsTypeName === 'string');
 exports.isMaxLengthStringField = isMaxLengthStringField;

package/dist/lib/schema/schema.d.ts

@@ -190,6 +190,10 @@ export type FieldCore = {
      * Name of the field in the source e.g. in the database (e.g. Id)
      */
     sourceName: string;
+    /**
+     * The type of the field as it appears in the schema (e.g. `Int`, `Float`, `String`).
+     */
+    type: string;
     /**
      * Validation rule for the field.
      */
@@ -216,7 +220,7 @@ export type FieldScalar = Prettify<Omit<FieldCore, 'name'> & {
     /**
      * Name of the scalar TypeScript type, e.g. string
      */
-    typeName: Types.TypeName;
+    tsTypeName: Types.TypeName;
     /**
      * If true, each element is unique.
      * Note: This is ensured by the repository/database
@@ -253,7 +257,7 @@ export type FieldId = Prettify<Omit<FieldCore, 'name'> & {
      * Name of the unbranded TypeScript type of the id field, e.g. string
      *
      * Note: This should only be used in the type generator - all other generators
-     * should use the branded type "typeName"!
+     * should use the branded type "tsTypeName"!
      */
     unbrandedTypeName: Types.TypeName;
 }>;
@@ -283,7 +287,7 @@ export declare const isFieldId: (field: Field) => field is Prettify<Omit<FieldCo
      * Name of the unbranded TypeScript type of the id field, e.g. string
      *
      * Note: This should only be used in the type generator - all other generators
-     * should use the branded type "typeName"!
+     * should use the branded type "tsTypeName"!
      */
     unbrandedTypeName: Types.TypeName;
 }>;
@@ -395,7 +399,7 @@ export type Enum = {
     /**
      * TypeScript type that should be used to reference an enumerator.
      */
-    typeName: Types.TypeName;
+    tsTypeName: Types.TypeName;
     /**
      * Object containing all optional attributes of the enum.
      */

package/dist/lib/schema/zod.js

@@ -28,7 +28,23 @@ exports.getZodDecoderDefinition = getZodDecoderDefinition;
 function getZodTypeDefinition(field) {
     switch (field.kind) {
         case 'scalar':
-            return `${field.typeName === 'Date' ? 'date' : field.typeName}()`;
+            switch (field.tsTypeName) {
+                case 'Date': {
+                    return `date()`;
+                }
+                case 'number': {
+                    switch (field.type) {
+                        case 'Int':
+                        case 'BigInt':
+                            return `number().int()`;
+                        default:
+                            return `number()`;
+                    }
+                }
+                default: {
+                    return `${field.tsTypeName}()`;
+                }
+            }
         case 'enum':
             return `enum([${field.enumerator.values.map((v) => `'${v}'`).join(', ')}])`;
         case 'id':

package/dist/prisma/parse.js

@@ -105,6 +105,7 @@ function parseModel({ dmmfModel, enums, models, config, }) {
             isRequired: dmmfField.isRequired,
             attributes,
             schemaConfig: config,
+            type: dmmfField.type,
         };
         // NOTE: We mark scalar fields which are used in relations as relation fields by Purple Schema standards.
         if (dmmfField.name in relations) {
@@ -129,7 +130,7 @@ function parseModel({ dmmfModel, enums, models, config, }) {
             if (dmmfField.type === 'Float') {
                 validation = { type: 'float' };
             }
-            return Object.assign(Object.assign({ kind: 'scalar', validation }, shared), { isUnique: isUniqueField(dmmfField), isGenerated: isAutoIncrementField(dmmfField), typeName: getTsTypeForScalar(dmmfField) });
+            return Object.assign(Object.assign({ kind: 'scalar', validation }, shared), { isUnique: isUniqueField(dmmfField), isGenerated: isAutoIncrementField(dmmfField), tsTypeName: getTsTypeForScalar(dmmfField) });
         }
         if (dmmfField.kind === 'enum') {
             const fieldEnumDef = enums.find((e) => e.sourceName === dmmfField.type);
@@ -227,7 +228,7 @@ function parseEnum({ dmmfEnum, config }) {
         name: dmmfEnum.name,
         description: attributes.description,
         attributes,
-        typeName: Types.toTypeName((0, string_1.toPascalCase)(dmmfEnum.name)),
+        tsTypeName: Types.toTypeName((0, string_1.toPascalCase)(dmmfEnum.name)),
         sourceName: dmmfEnum.name,
         values: dmmfEnum.values.map((v) => v.name),
         schemaConfig: config,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.16.0",
+  "version": "0.16.2",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {
@@ -22,7 +22,7 @@
     "prettier": "^2.8.7",
     "remeda": "1.9.4",
     "zod": "3.21.4",
-    "@postxl/lock": "0.4.2"
+    "@postxl/lock": "0.4.4"
   },
   "devDependencies": {
     "@prisma/client": "4.12.0",
@@ -43,8 +43,8 @@
     "autoDetect": true
   },
   "scripts": {
-    "build": "tsc -b",
-    "prepublish": "tsc -b",
+    "build": "tsc -p tsconfig.build.json",
+    "prepublish": "tsc -p tsconfig.build.json",
     "dev": "tsc -b -w",
     "test": "jest",
     "test:watch": "jest --watch",