sonamu 0.2.53 → 0.3.1

package/dist/{chunk-5UCV2JP3.js → chunk-YXILRRDT.js}

@@ -356,6 +356,19 @@ function getZodTypeFromApiParamType(paramType, references) {
           return reference;
         case "union":
           const unionType = paramType;
+          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 _zod.z.union(
             unionType.types.map(
               (type) => getZodTypeFromApiParamType(type, references)
@@ -3121,7 +3134,7 @@ var Syncer = class {
       const name = paramDec.name;
       const type = this.resolveTypeNode(paramDec.type);
       if (name === void 0) {
-        console.log({ name, type, paramDec });
+        console.debug({ name, type, paramDec });
       }
       return {
         name: name.escapedText ? name.escapedText.toString() : `nonameAt${index}`,
@@ -3340,7 +3353,7 @@ var Syncer = class {
     await _fsextra2.default.writeJSON(this.checksumsPath, checksums, {
       spaces: 2
     });
-    console.debug("checksum saved", this.checksumsPath);
+    console.log("checksum saved", this.checksumsPath);
   }
   async getChecksumOfFile(filePath) {
     return new Promise((resolve, reject) => {
@@ -3816,30 +3829,36 @@ var Syncer = class {
     const enumsKeys = Object.keys(enums).filter(
       (name) => name !== names.constant
     );
-    return keys.reduce((result, key) => {
-      const tpl = this.getTemplate(key);
-      if (key.startsWith("view_enums")) {
-        enumsKeys.map((componentId) => {
-          const { target: target2, path: p2 } = tpl.getTargetAndPath(names, componentId);
-          result[`${key}__${componentId}`] = _fsextra2.default.existsSync(
-            _path2.default.join(Sonamu.appRootPath, target2, p2)
-          );
-        });
+    return keys.reduce(
+      (result, key) => {
+        const tpl = this.getTemplate(key);
+        if (key.startsWith("view_enums")) {
+          enumsKeys.map((componentId) => {
+            const { target: target2, path: p2 } = tpl.getTargetAndPath(
+              names,
+              componentId
+            );
+            result[`${key}__${componentId}`] = _fsextra2.default.existsSync(
+              _path2.default.join(Sonamu.appRootPath, target2, p2)
+            );
+          });
+          return result;
+        }
+        const { target, path: p } = tpl.getTargetAndPath(names);
+        const { targets } = Sonamu.config.sync;
+        if (target.includes(":target")) {
+          targets.map((t) => {
+            result[`${key}__${t}`] = _fsextra2.default.existsSync(
+              _path2.default.join(Sonamu.appRootPath, target.replace(":target", t), p)
+            );
+          });
+        } else {
+          result[key] = _fsextra2.default.existsSync(_path2.default.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}`] = _fsextra2.default.existsSync(
-            _path2.default.join(Sonamu.appRootPath, target.replace(":target", t), p)
-          );
-        });
-      } else {
-        result[key] = _fsextra2.default.existsSync(_path2.default.join(Sonamu.appRootPath, target, p));
-      }
-      return result;
-    }, {});
+      },
+      {}
+    );
   }
   async getZodTypeById(zodTypeId) {
     const modulePath = EntityManager.getModulePath(zodTypeId);
@@ -3879,9 +3898,7 @@ var Syncer = class {
       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;
         },
         {}
@@ -5008,7 +5025,7 @@ var EntityManagerClass = class {
       _glob2.default.glob(_path2.default.resolve(pathPattern), (_err, files) => {
         Promise.all(
           files.map(async (file) => {
-            this.register(JSON.parse(_fsextra2.default.readFileSync(file).toString()));
+            await this.register(JSON.parse(_fsextra2.default.readFileSync(file).toString()));
           })
         ).then(() => {
           resolve("ok");
@@ -5025,15 +5042,17 @@ var EntityManagerClass = class {
     this.isAutoloaded = false;
     const sonamuPath = _path2.default.join(
       Sonamu.apiRootPath,
-      "dist/application/sonamu.generated.js"
+      `dist/application/sonamu.generated.js?t=${Date.now()}`
     );
-    if (__require.cache[sonamuPath]) {
+    if (_optionalChain([__require, 'optionalAccess', _87 => _87.cache]) && __require.cache[sonamuPath]) {
       delete __require.cache[sonamuPath];
     }
-    return this.autoload(doSilent);
+    return await this.autoload(doSilent);
   }
-  register(json) {
+  async register(json) {
     const entity = new Entity(json);
+    await entity.registerModulePaths();
+    entity.registerTableSpecs();
     this.entities.set(json.id, entity);
   }
   get(entityId) {
@@ -5166,8 +5185,6 @@ var Entity = class {
       fs: _inflection2.default.dasherize(_inflection2.default.underscore(id)).toLowerCase(),
       module: id
     };
-    this.registerModulePaths();
-    this.registerTableSpecs();
   }
   /*
     subset SELECT/JOIN/LOADER 결과 리턴
@@ -5313,7 +5330,7 @@ var Entity = class {
           const relSubsetQuery = relEntity.resolveSubsetQuery("", relFields);
           let manyJoin;
           if (isHasManyRelationProp(relation)) {
-            const fromCol = _nullishCoalesce(_optionalChain([relation, 'optionalAccess', _87 => _87.fromColumn]), () => ( "id"));
+            const fromCol = _nullishCoalesce(_optionalChain([relation, 'optionalAccess', _88 => _88.fromColumn]), () => ( "id"));
             manyJoin = {
               fromTable: this.table,
               fromCol,
@@ -5485,7 +5502,7 @@ var Entity = class {
       return prop.name;
     }).filter(nonNullable);
   }
-  registerModulePaths() {
+  async registerModulePaths() {
     const basePath = `${this.names.parentFs}`;
     EntityManager.setModulePath(`${this.id}BaseSchema`, `sonamu.generated`);
     if (Object.keys(this.subsets).length > 0) {
@@ -5511,15 +5528,14 @@ var Entity = class {
     );
     if (_fsextra2.default.existsSync(typesFileDistPath)) {
       const importPath = _path2.default.relative(__dirname, typesFileDistPath);
-      Promise.resolve().then(() => _interopRequireWildcard(require(importPath))).then((t) => {
-        this.types = Object.keys(t).reduce((result, key) => {
-          EntityManager.setModulePath(key, typesModulePath);
-          return {
-            ...result,
-            [key]: t[key]
-          };
-        }, {});
-      });
+      const t = await Promise.resolve().then(() => _interopRequireWildcard(require(importPath)));
+      this.types = Object.keys(t).reduce((result, key) => {
+        EntityManager.setModulePath(key, typesModulePath);
+        return {
+          ...result,
+          [key]: t[key]
+        };
+      }, {});
     }
   }
   registerTableSpecs() {
@@ -6518,7 +6534,7 @@ ${onlyTs.map((f) => f.name).join("\n")}`
         const [, keyName, from, referencesTable, referencesField, onClause] = matched2;
         const [onUpdateFull, _onUpdate] = _nullishCoalesce((_nullishCoalesce(onClause, () => ( ""))).match(/ON UPDATE ([A-Z ]+)$/), () => ( []));
         const onUpdate = _nullishCoalesce(_onUpdate, () => ( "NO ACTION"));
-        const onDelete = _nullishCoalesce(_optionalChain([(_nullishCoalesce(onClause, () => ( ""))), 'access', _88 => _88.replace, 'call', _89 => _89(_nullishCoalesce(onUpdateFull, () => ( "")), ""), 'access', _90 => _90.match, 'call', _91 => _91(/ON DELETE ([A-Z ]+) /), 'optionalAccess', _92 => _92[1]]), () => ( "NO ACTION"));
+        const onDelete = _nullishCoalesce(_optionalChain([(_nullishCoalesce(onClause, () => ( ""))), 'access', _89 => _89.replace, 'call', _90 => _90(_nullishCoalesce(onUpdateFull, () => ( "")), ""), 'access', _91 => _91.match, 'call', _92 => _92(/ON DELETE ([A-Z ]+) /), 'optionalAccess', _93 => _93[1]]), () => ( "NO ACTION"));
         return {
           keyName,
           from,
@@ -7393,7 +7409,7 @@ var FixtureManagerClass = class {
     const targetDB = _knex2.default.call(void 0, Sonamu.dbConfig[targetDBName]);
     const { entityId, field, value, searchType } = searchOptions;
     const entity = EntityManager.get(entityId);
-    const column = _optionalChain([entity, 'access', _93 => _93.props, 'access', _94 => _94.find, 'call', _95 => _95((prop) => prop.name === field), 'optionalAccess', _96 => _96.type]) === "relation" ? `${field}_id` : field;
+    const column = _optionalChain([entity, 'access', _94 => _94.props, 'access', _95 => _95.find, 'call', _96 => _96((prop) => prop.name === field), 'optionalAccess', _97 => _97.type]) === "relation" ? `${field}_id` : field;
     let query = sourceDB(entity.table);
     if (searchType === "equals") {
       query = query.where(column, value);
@@ -7465,7 +7481,7 @@ var FixtureManagerClass = class {
         prop,
         value: row[prop.name]
       };
-      const db = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _97 => _97._db]), () => ( BaseModel.getDB("w")));
+      const db = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _98 => _98._db]), () => ( BaseModel.getDB("w")));
       if (isManyToManyRelationProp(prop)) {
         const relatedEntity = EntityManager.get(prop.with);
         const throughTable = prop.joinTable;
@@ -7484,7 +7500,7 @@ var FixtureManagerClass = class {
         );
         if (relatedProp) {
           const relatedRow = await db(relatedEntity.table).where("id", row.id).first();
-          record.columns[prop.name].value = _optionalChain([relatedRow, 'optionalAccess', _98 => _98.id]);
+          record.columns[prop.name].value = _optionalChain([relatedRow, 'optionalAccess', _99 => _99.id]);
         }
       } else if (isRelationProp(prop)) {
         const relatedId = row[`${prop.name}_id`];
@@ -7492,7 +7508,7 @@ var FixtureManagerClass = class {
         if (relatedId) {
           record.belongsRecords.push(`${prop.with}#${relatedId}`);
         }
-        if (!_optionalChain([options, 'optionalAccess', _99 => _99.singleRecord]) && relatedId) {
+        if (!_optionalChain([options, 'optionalAccess', _100 => _100.singleRecord]) && relatedId) {
           const relatedEntity = EntityManager.get(prop.with);
           const relatedRow = await db(relatedEntity.table).where("id", relatedId).first();
           if (relatedRow) {
@@ -7832,4 +7848,4 @@ var FixtureManager = new FixtureManagerClass();
 
 
 exports.SQLDateTimeString = SQLDateTimeString; exports.zArrayable = zArrayable; exports.isIntegerProp = isIntegerProp; exports.isBigIntegerProp = isBigIntegerProp; exports.isTextProp = isTextProp; exports.isStringProp = isStringProp; exports.isEnumProp = isEnumProp; exports.isFloatProp = isFloatProp; exports.isDoubleProp = isDoubleProp; exports.isDecimalProp = isDecimalProp; exports.isBooleanProp = isBooleanProp; exports.isDateProp = isDateProp; exports.isDateTimeProp = isDateTimeProp; exports.isTimeProp = isTimeProp; exports.isTimestampProp = isTimestampProp; exports.isJsonProp = isJsonProp; exports.isUuidProp = isUuidProp; exports.isVirtualProp = isVirtualProp; exports.isRelationProp = isRelationProp; exports.isOneToOneRelationProp = isOneToOneRelationProp; exports.isBelongsToOneRelationProp = isBelongsToOneRelationProp; exports.isHasManyRelationProp = isHasManyRelationProp; exports.isManyToManyRelationProp = isManyToManyRelationProp; exports.isCustomJoinClause = isCustomJoinClause; exports.SonamuQueryMode = SonamuQueryMode; exports.isKnexError = isKnexError; exports.ApiParamType = ApiParamType; exports.RenderingNode = RenderingNode; exports.TemplateOptions = TemplateOptions; exports.TemplateKey = TemplateKey; exports.GenerateOptions = GenerateOptions; exports.PathAndCode = PathAndCode; exports.getZodObjectFromApi = getZodObjectFromApi; exports.getZodObjectFromApiParams = getZodObjectFromApiParams; exports.getZodTypeFromApiParamType = getZodTypeFromApiParamType; exports.propNodeToZodTypeDef = propNodeToZodTypeDef; exports.getTextTypeLength = getTextTypeLength; exports.propToZodTypeDef = propToZodTypeDef; exports.zodTypeToZodCode = zodTypeToZodCode; exports.apiParamToTsCode = apiParamToTsCode; exports.apiParamTypeToTsType = apiParamTypeToTsType; exports.unwrapPromiseOnce = unwrapPromiseOnce; exports.serializeZodType = serializeZodType; exports.zodTypeToTsTypeDef = zodTypeToTsTypeDef; exports.registeredApis = registeredApis; exports.api = api; exports.SoException = SoException; exports.isSoException = isSoException; exports.BadRequestException = BadRequestException; exports.UnauthorizedException = UnauthorizedException; exports.NotFoundException = NotFoundException; exports.ServiceUnavailableException = ServiceUnavailableException; exports.InternalServerErrorException = InternalServerErrorException; exports.AlreadyProcessedException = AlreadyProcessedException; exports.DuplicateRowException = DuplicateRowException; exports.TargetNotFoundException = TargetNotFoundException; exports.globAsync = globAsync; exports.importMultiple = importMultiple; exports.findAppRootPath = findAppRootPath; exports.findApiRootPath = findApiRootPath; exports.nonNullable = nonNullable; exports.Entity = Entity; exports.EntityManager = EntityManager; exports.Syncer = Syncer; exports.isLocal = isLocal; exports.isRemote = isRemote; exports.isInDocker = isInDocker; exports.isDaemonServer = isDaemonServer; exports.isDevelopment = isDevelopment; exports.isStaging = isStaging; exports.isProduction = isProduction; exports.isTest = isTest; exports.DB = DB; exports.isRefField = isRefField; exports.UpsertBuilder = UpsertBuilder; exports.BaseModelClass = BaseModelClass; exports.BaseModel = BaseModel; exports.Sonamu = Sonamu; exports.Migrator = Migrator; exports.FixtureManagerClass = FixtureManagerClass; exports.FixtureManager = FixtureManager;
-//# sourceMappingURL=chunk-5UCV2JP3.js.map
+//# sourceMappingURL=chunk-YXILRRDT.js.map