sonamu 0.2.53 → 0.3.1

package/dist/index.d.mts

@@ -862,7 +862,7 @@ declare class Entity {
     fieldExprsToPropNodes(fieldExprs: string[], entity?: Entity): EntityPropNode[];
     getFieldExprs(prefix?: string, maxDepth?: number, froms?: string[]): string[];
     getTableColumns(): string[];
-    registerModulePaths(): void;
+    registerModulePaths(): Promise<void>;
     registerTableSpecs(): void;
     toJson(): EntityJson;
     save(): Promise<void>;
@@ -896,7 +896,7 @@ declare class EntityManagerClass {
     isAutoloaded: boolean;
     autoload(doSilent?: boolean): Promise<unknown>;
     reload(doSilent?: boolean): Promise<unknown>;
-    register(json: EntityJson): void;
+    register(json: EntityJson): Promise<void>;
     get(entityId: string): Entity;
     exists(entityId: string): boolean;
     getAllIds(): string[];

package/dist/index.d.ts

@@ -862,7 +862,7 @@ declare class Entity {
     fieldExprsToPropNodes(fieldExprs: string[], entity?: Entity): EntityPropNode[];
     getFieldExprs(prefix?: string, maxDepth?: number, froms?: string[]): string[];
     getTableColumns(): string[];
-    registerModulePaths(): void;
+    registerModulePaths(): Promise<void>;
     registerTableSpecs(): void;
     toJson(): EntityJson;
     save(): Promise<void>;
@@ -896,7 +896,7 @@ declare class EntityManagerClass {
     isAutoloaded: boolean;
     autoload(doSilent?: boolean): Promise<unknown>;
     reload(doSilent?: boolean): Promise<unknown>;
-    register(json: EntityJson): void;
+    register(json: EntityJson): Promise<void>;
     get(entityId: string): Entity;
     exists(entityId: string): boolean;
     getAllIds(): string[];

package/dist/index.js

@@ -80,13 +80,13 @@
 
 
 
-var _chunk5UCV2JP3js = require('./chunk-5UCV2JP3.js');
+var _chunkYXILRRDTjs = require('./chunk-YXILRRDT.js');
 
 // src/exceptions/error-handler.ts
 function setupErrorHandler(server) {
   server.setErrorHandler((error, request, reply) => {
     _nullishCoalesce(error.statusCode, () => ( (error.statusCode = 400)));
-    if (_chunk5UCV2JP3js.isSoException.call(void 0, error) && error.payload && Array.isArray(error.payload)) {
+    if (_chunkYXILRRDTjs.isSoException.call(void 0, error) && error.payload && Array.isArray(error.payload)) {
       const issues = error.payload;
       const [issue] = issues;
       const message = `${issue.message} (${issue.path.join("/")})`;
@@ -423,5 +423,5 @@ function unique(columns) {
 
 
 
-exports.AlreadyProcessedException = _chunk5UCV2JP3js.AlreadyProcessedException; exports.ApiParamType = _chunk5UCV2JP3js.ApiParamType; exports.BadRequestException = _chunk5UCV2JP3js.BadRequestException; exports.BaseModel = _chunk5UCV2JP3js.BaseModel; exports.BaseModelClass = _chunk5UCV2JP3js.BaseModelClass; exports.DB = _chunk5UCV2JP3js.DB; exports.DuplicateRowException = _chunk5UCV2JP3js.DuplicateRowException; exports.Entity = _chunk5UCV2JP3js.Entity; exports.EntityManager = _chunk5UCV2JP3js.EntityManager; exports.FixtureManager = _chunk5UCV2JP3js.FixtureManager; exports.FixtureManagerClass = _chunk5UCV2JP3js.FixtureManagerClass; exports.GenerateOptions = _chunk5UCV2JP3js.GenerateOptions; exports.InternalServerErrorException = _chunk5UCV2JP3js.InternalServerErrorException; exports.Migrator = _chunk5UCV2JP3js.Migrator; exports.NotFoundException = _chunk5UCV2JP3js.NotFoundException; exports.PathAndCode = _chunk5UCV2JP3js.PathAndCode; exports.RenderingNode = _chunk5UCV2JP3js.RenderingNode; exports.SQLDateTimeString = _chunk5UCV2JP3js.SQLDateTimeString; exports.ServiceUnavailableException = _chunk5UCV2JP3js.ServiceUnavailableException; exports.SoException = _chunk5UCV2JP3js.SoException; exports.Sonamu = _chunk5UCV2JP3js.Sonamu; exports.SonamuQueryMode = _chunk5UCV2JP3js.SonamuQueryMode; exports.Syncer = _chunk5UCV2JP3js.Syncer; exports.TargetNotFoundException = _chunk5UCV2JP3js.TargetNotFoundException; exports.TemplateKey = _chunk5UCV2JP3js.TemplateKey; exports.TemplateOptions = _chunk5UCV2JP3js.TemplateOptions; exports.UnauthorizedException = _chunk5UCV2JP3js.UnauthorizedException; exports.UpsertBuilder = _chunk5UCV2JP3js.UpsertBuilder; exports.api = _chunk5UCV2JP3js.api; exports.apiParamToTsCode = _chunk5UCV2JP3js.apiParamToTsCode; exports.apiParamTypeToTsType = _chunk5UCV2JP3js.apiParamTypeToTsType; exports.asArray = asArray; exports.findApiRootPath = _chunk5UCV2JP3js.findApiRootPath; exports.findAppRootPath = _chunk5UCV2JP3js.findAppRootPath; exports.getTextTypeLength = _chunk5UCV2JP3js.getTextTypeLength; exports.getZodObjectFromApi = _chunk5UCV2JP3js.getZodObjectFromApi; exports.getZodObjectFromApiParams = _chunk5UCV2JP3js.getZodObjectFromApiParams; exports.getZodTypeFromApiParamType = _chunk5UCV2JP3js.getZodTypeFromApiParamType; exports.globAsync = _chunk5UCV2JP3js.globAsync; exports.i = i; exports.importMultiple = _chunk5UCV2JP3js.importMultiple; exports.isBelongsToOneRelationProp = _chunk5UCV2JP3js.isBelongsToOneRelationProp; exports.isBigIntegerProp = _chunk5UCV2JP3js.isBigIntegerProp; exports.isBooleanProp = _chunk5UCV2JP3js.isBooleanProp; exports.isCustomJoinClause = _chunk5UCV2JP3js.isCustomJoinClause; exports.isDaemonServer = _chunk5UCV2JP3js.isDaemonServer; exports.isDateProp = _chunk5UCV2JP3js.isDateProp; exports.isDateTimeProp = _chunk5UCV2JP3js.isDateTimeProp; exports.isDecimalProp = _chunk5UCV2JP3js.isDecimalProp; exports.isDevelopment = _chunk5UCV2JP3js.isDevelopment; exports.isDoubleProp = _chunk5UCV2JP3js.isDoubleProp; exports.isEnumProp = _chunk5UCV2JP3js.isEnumProp; exports.isFloatProp = _chunk5UCV2JP3js.isFloatProp; exports.isHasManyRelationProp = _chunk5UCV2JP3js.isHasManyRelationProp; exports.isInDocker = _chunk5UCV2JP3js.isInDocker; exports.isIntegerProp = _chunk5UCV2JP3js.isIntegerProp; exports.isJsonProp = _chunk5UCV2JP3js.isJsonProp; exports.isKnexError = _chunk5UCV2JP3js.isKnexError; exports.isLocal = _chunk5UCV2JP3js.isLocal; exports.isManyToManyRelationProp = _chunk5UCV2JP3js.isManyToManyRelationProp; exports.isOneToOneRelationProp = _chunk5UCV2JP3js.isOneToOneRelationProp; exports.isProduction = _chunk5UCV2JP3js.isProduction; exports.isRefField = _chunk5UCV2JP3js.isRefField; exports.isRelationProp = _chunk5UCV2JP3js.isRelationProp; exports.isRemote = _chunk5UCV2JP3js.isRemote; exports.isSoException = _chunk5UCV2JP3js.isSoException; exports.isStaging = _chunk5UCV2JP3js.isStaging; exports.isStringProp = _chunk5UCV2JP3js.isStringProp; exports.isTest = _chunk5UCV2JP3js.isTest; exports.isTextProp = _chunk5UCV2JP3js.isTextProp; exports.isTimeProp = _chunk5UCV2JP3js.isTimeProp; exports.isTimestampProp = _chunk5UCV2JP3js.isTimestampProp; exports.isUuidProp = _chunk5UCV2JP3js.isUuidProp; exports.isVirtualProp = _chunk5UCV2JP3js.isVirtualProp; exports.nonNullable = _chunk5UCV2JP3js.nonNullable; exports.objToMap = objToMap; exports.p = p; exports.propNodeToZodTypeDef = _chunk5UCV2JP3js.propNodeToZodTypeDef; exports.propToZodTypeDef = _chunk5UCV2JP3js.propToZodTypeDef; exports.registeredApis = _chunk5UCV2JP3js.registeredApis; exports.serializeZodType = _chunk5UCV2JP3js.serializeZodType; exports.setupErrorHandler = setupErrorHandler; exports.unwrapPromiseOnce = _chunk5UCV2JP3js.unwrapPromiseOnce; exports.zArrayable = _chunk5UCV2JP3js.zArrayable; exports.zodTypeToTsTypeDef = _chunk5UCV2JP3js.zodTypeToTsTypeDef; exports.zodTypeToZodCode = _chunk5UCV2JP3js.zodTypeToZodCode;
+exports.AlreadyProcessedException = _chunkYXILRRDTjs.AlreadyProcessedException; exports.ApiParamType = _chunkYXILRRDTjs.ApiParamType; exports.BadRequestException = _chunkYXILRRDTjs.BadRequestException; exports.BaseModel = _chunkYXILRRDTjs.BaseModel; exports.BaseModelClass = _chunkYXILRRDTjs.BaseModelClass; exports.DB = _chunkYXILRRDTjs.DB; exports.DuplicateRowException = _chunkYXILRRDTjs.DuplicateRowException; exports.Entity = _chunkYXILRRDTjs.Entity; exports.EntityManager = _chunkYXILRRDTjs.EntityManager; exports.FixtureManager = _chunkYXILRRDTjs.FixtureManager; exports.FixtureManagerClass = _chunkYXILRRDTjs.FixtureManagerClass; exports.GenerateOptions = _chunkYXILRRDTjs.GenerateOptions; exports.InternalServerErrorException = _chunkYXILRRDTjs.InternalServerErrorException; exports.Migrator = _chunkYXILRRDTjs.Migrator; exports.NotFoundException = _chunkYXILRRDTjs.NotFoundException; exports.PathAndCode = _chunkYXILRRDTjs.PathAndCode; exports.RenderingNode = _chunkYXILRRDTjs.RenderingNode; exports.SQLDateTimeString = _chunkYXILRRDTjs.SQLDateTimeString; exports.ServiceUnavailableException = _chunkYXILRRDTjs.ServiceUnavailableException; exports.SoException = _chunkYXILRRDTjs.SoException; exports.Sonamu = _chunkYXILRRDTjs.Sonamu; exports.SonamuQueryMode = _chunkYXILRRDTjs.SonamuQueryMode; exports.Syncer = _chunkYXILRRDTjs.Syncer; exports.TargetNotFoundException = _chunkYXILRRDTjs.TargetNotFoundException; exports.TemplateKey = _chunkYXILRRDTjs.TemplateKey; exports.TemplateOptions = _chunkYXILRRDTjs.TemplateOptions; exports.UnauthorizedException = _chunkYXILRRDTjs.UnauthorizedException; exports.UpsertBuilder = _chunkYXILRRDTjs.UpsertBuilder; exports.api = _chunkYXILRRDTjs.api; exports.apiParamToTsCode = _chunkYXILRRDTjs.apiParamToTsCode; exports.apiParamTypeToTsType = _chunkYXILRRDTjs.apiParamTypeToTsType; exports.asArray = asArray; exports.findApiRootPath = _chunkYXILRRDTjs.findApiRootPath; exports.findAppRootPath = _chunkYXILRRDTjs.findAppRootPath; exports.getTextTypeLength = _chunkYXILRRDTjs.getTextTypeLength; exports.getZodObjectFromApi = _chunkYXILRRDTjs.getZodObjectFromApi; exports.getZodObjectFromApiParams = _chunkYXILRRDTjs.getZodObjectFromApiParams; exports.getZodTypeFromApiParamType = _chunkYXILRRDTjs.getZodTypeFromApiParamType; exports.globAsync = _chunkYXILRRDTjs.globAsync; exports.i = i; exports.importMultiple = _chunkYXILRRDTjs.importMultiple; exports.isBelongsToOneRelationProp = _chunkYXILRRDTjs.isBelongsToOneRelationProp; exports.isBigIntegerProp = _chunkYXILRRDTjs.isBigIntegerProp; exports.isBooleanProp = _chunkYXILRRDTjs.isBooleanProp; exports.isCustomJoinClause = _chunkYXILRRDTjs.isCustomJoinClause; exports.isDaemonServer = _chunkYXILRRDTjs.isDaemonServer; exports.isDateProp = _chunkYXILRRDTjs.isDateProp; exports.isDateTimeProp = _chunkYXILRRDTjs.isDateTimeProp; exports.isDecimalProp = _chunkYXILRRDTjs.isDecimalProp; exports.isDevelopment = _chunkYXILRRDTjs.isDevelopment; exports.isDoubleProp = _chunkYXILRRDTjs.isDoubleProp; exports.isEnumProp = _chunkYXILRRDTjs.isEnumProp; exports.isFloatProp = _chunkYXILRRDTjs.isFloatProp; exports.isHasManyRelationProp = _chunkYXILRRDTjs.isHasManyRelationProp; exports.isInDocker = _chunkYXILRRDTjs.isInDocker; exports.isIntegerProp = _chunkYXILRRDTjs.isIntegerProp; exports.isJsonProp = _chunkYXILRRDTjs.isJsonProp; exports.isKnexError = _chunkYXILRRDTjs.isKnexError; exports.isLocal = _chunkYXILRRDTjs.isLocal; exports.isManyToManyRelationProp = _chunkYXILRRDTjs.isManyToManyRelationProp; exports.isOneToOneRelationProp = _chunkYXILRRDTjs.isOneToOneRelationProp; exports.isProduction = _chunkYXILRRDTjs.isProduction; exports.isRefField = _chunkYXILRRDTjs.isRefField; exports.isRelationProp = _chunkYXILRRDTjs.isRelationProp; exports.isRemote = _chunkYXILRRDTjs.isRemote; exports.isSoException = _chunkYXILRRDTjs.isSoException; exports.isStaging = _chunkYXILRRDTjs.isStaging; exports.isStringProp = _chunkYXILRRDTjs.isStringProp; exports.isTest = _chunkYXILRRDTjs.isTest; exports.isTextProp = _chunkYXILRRDTjs.isTextProp; exports.isTimeProp = _chunkYXILRRDTjs.isTimeProp; exports.isTimestampProp = _chunkYXILRRDTjs.isTimestampProp; exports.isUuidProp = _chunkYXILRRDTjs.isUuidProp; exports.isVirtualProp = _chunkYXILRRDTjs.isVirtualProp; exports.nonNullable = _chunkYXILRRDTjs.nonNullable; exports.objToMap = objToMap; exports.p = p; exports.propNodeToZodTypeDef = _chunkYXILRRDTjs.propNodeToZodTypeDef; exports.propToZodTypeDef = _chunkYXILRRDTjs.propToZodTypeDef; exports.registeredApis = _chunkYXILRRDTjs.registeredApis; exports.serializeZodType = _chunkYXILRRDTjs.serializeZodType; exports.setupErrorHandler = setupErrorHandler; exports.unwrapPromiseOnce = _chunkYXILRRDTjs.unwrapPromiseOnce; exports.zArrayable = _chunkYXILRRDTjs.zArrayable; exports.zodTypeToTsTypeDef = _chunkYXILRRDTjs.zodTypeToTsTypeDef; exports.zodTypeToZodCode = _chunkYXILRRDTjs.zodTypeToZodCode;
 //# sourceMappingURL=index.js.map

package/dist/index.mjs

@@ -80,7 +80,7 @@ import {
   zArrayable,
   zodTypeToTsTypeDef,
   zodTypeToZodCode
-} from "./chunk-XTNCGTDO.mjs";
+} from "./chunk-MPXE4IHO.mjs";
 import "./chunk-PTFDTOJU.mjs";
 
 // src/exceptions/error-handler.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sonamu",
-  "version": "0.2.53",
+  "version": "0.3.1",
   "description": "Sonamu — TypeScript Fullstack API Framework",
   "keywords": [
     "typescript",

package/src/api/code-converters.ts

@@ -174,6 +174,25 @@ export function getZodTypeFromApiParamType(
             t: string;
             types: ApiParamType[];
           };
+          // nullable 유니온
+          if (
+            unionType.types.length === 2 &&
+            unionType.types.some((type) => type === "null")
+          ) {
+            if (unionType.types[0] === "null") {
+              return getZodTypeFromApiParamType(
+                unionType.types[1],
+                references
+              ).nullable();
+            } else {
+              return getZodTypeFromApiParamType(
+                unionType.types[0],
+                references
+              ).nullable();
+            }
+          }
+
+          // 일반 유니온
           return z.union(
             unionType.types.map((type) =>
               getZodTypeFromApiParamType(type, references)

package/src/entity/entity-manager.ts

@@ -44,7 +44,7 @@ class EntityManagerClass {
       glob.glob(path.resolve(pathPattern!), (_err, files) => {
         Promise.all(
           files.map(async (file) => {
-            this.register(JSON.parse(fs.readFileSync(file).toString()));
+            await this.register(JSON.parse(fs.readFileSync(file).toString()));
           })
         ).then(() => {
           resolve("ok");
@@ -63,18 +63,22 @@ class EntityManagerClass {
 
     const sonamuPath = path.join(
       Sonamu.apiRootPath,
-      "dist/application/sonamu.generated.js"
+      `dist/application/sonamu.generated.js?t=${Date.now()}`
     );
-    if (require.cache[sonamuPath]) {
+    // CJS
+    if (require?.cache && require.cache[sonamuPath]) {
       delete require.cache[sonamuPath];
     }
 
-    return this.autoload(doSilent);
+    return await this.autoload(doSilent);
   }
 
-  register(json: EntityJson): void {
+  async register(json: EntityJson): Promise<void> {
     const entity = new Entity(json);
+    await entity.registerModulePaths();
+    entity.registerTableSpecs();
     this.entities.set(json.id, entity);
+    // console.debug(chalk.cyan(`register :: ${entity.id}`));
   }
 
   get(entityId: string): Entity {

package/src/entity/entity.ts

@@ -133,9 +133,6 @@ export class Entity {
       fs: inflection.dasherize(inflection.underscore(id)).toLowerCase(),
       module: id,
     };
-
-    this.registerModulePaths();
-    this.registerTableSpecs();
   }
 
   /*
@@ -544,7 +541,7 @@ export class Entity {
       .filter(nonNullable);
   }
 
-  registerModulePaths() {
+  async registerModulePaths() {
     const basePath = `${this.names.parentFs}`;
 
     // base-scheme
@@ -579,15 +576,14 @@ export class Entity {
 
     if (fs.existsSync(typesFileDistPath)) {
       const importPath = path.relative(__dirname, typesFileDistPath);
-      import(importPath).then((t) => {
-        this.types = Object.keys(t).reduce((result, key) => {
-          EntityManager.setModulePath(key, typesModulePath);
-          return {
-            ...result,
-            [key]: t[key],
-          };
-        }, {});
-      });
+      const t = await import(importPath);
+      this.types = Object.keys(t).reduce((result, key) => {
+        EntityManager.setModulePath(key, typesModulePath);
+        return {
+          ...result,
+          [key]: t[key],
+        };
+      }, {});
     }
   }
 

package/src/syncer/syncer.ts

@@ -397,7 +397,7 @@ export class Syncer {
     await fs.writeJSON(this.checksumsPath, checksums, {
       spaces: 2,
     });
-    console.debug("checksum saved", this.checksumsPath);
+    console.log("checksum saved", this.checksumsPath);
   }
 
   async getChecksumOfFile(filePath: string): Promise<string> {
@@ -658,7 +658,7 @@ export class Syncer {
     const type = this.resolveTypeNode(paramDec.type);
 
     if (name === undefined) {
-      console.log({ name, type, paramDec });
+      console.debug({ name, type, paramDec });
     }
 
     return {
@@ -1023,32 +1023,38 @@ export class Syncer {
       (name) => name !== names.constant
     );
 
-    return keys.reduce((result, key) => {
-      const tpl = this.getTemplate(key);
-      if (key.startsWith("view_enums")) {
-        enumsKeys.map((componentId) => {
-          const { target, path: p } = tpl.getTargetAndPath(names, componentId);
-          result[`${key}__${componentId}`] = fs.existsSync(
-            path.join(Sonamu.appRootPath, target, p)
-          );
-        });
-        return result;
-      }
+    return keys.reduce(
+      (result, key) => {
+        const tpl = this.getTemplate(key);
+        if (key.startsWith("view_enums")) {
+          enumsKeys.map((componentId) => {
+            const { target, path: p } = tpl.getTargetAndPath(
+              names,
+              componentId
+            );
+            result[`${key}__${componentId}`] = fs.existsSync(
+              path.join(Sonamu.appRootPath, target, p)
+            );
+          });
+          return result;
+        }
 
-      const { target, path: p } = tpl.getTargetAndPath(names);
-      const { targets } = Sonamu.config.sync;
-      if (target.includes(":target")) {
-        targets.map((t) => {
-          result[`${key}__${t}`] = fs.existsSync(
-            path.join(Sonamu.appRootPath, target.replace(":target", t), p)
-          );
-        });
-      } else {
-        result[key] = fs.existsSync(path.join(Sonamu.appRootPath, target, p));
-      }
+        const { target, path: p } = tpl.getTargetAndPath(names);
+        const { targets } = Sonamu.config.sync;
+        if (target.includes(":target")) {
+          targets.map((t) => {
+            result[`${key}__${t}`] = fs.existsSync(
+              path.join(Sonamu.appRootPath, target.replace(":target", t), p)
+            );
+          });
+        } else {
+          result[key] = fs.existsSync(path.join(Sonamu.appRootPath, target, p));
+        }
 
-      return result;
-    }, {} as Record<`${TemplateKey}${string}`, boolean>);
+        return result;
+      },
+      {} as Record<`${TemplateKey}${string}`, boolean>
+    );
   }
 
   async getZodTypeById(zodTypeId: string): Promise<z.ZodTypeAny> {
@@ -1093,9 +1099,8 @@ export class Syncer {
       const obj = await propNode.children.reduce(
         async (promise, childPropNode) => {
           const result = await promise;
-          result[childPropNode.prop!.name] = await this.propNodeToZodType(
-            childPropNode
-          );
+          result[childPropNode.prop!.name] =
+            await this.propNodeToZodType(childPropNode);
           return result;
         },
         {} as any