rads-db 3.2.37 → 3.2.39

package/dist/config.cjs

@@ -612,70 +612,82 @@ async function expandToDirectories(patterns) {
   }
   return dirs;
 }
-function schemaFromFiles(paths, options) {
-  return async () => {
-    const pathsArray = Array.isArray(paths) ? paths : [paths];
-    const resolvedDirs = [];
-    for (const p of pathsArray) {
-      if (fg__default.isDynamicPattern(p)) {
-        const matches = await fg__default(p, { onlyDirectories: true, absolute: true });
-        resolvedDirs.push(...matches);
-      } else {
-        const resolved = path__default.resolve(p);
-        if (!fs__default.existsSync(resolved))
-          await fs__default.promises.mkdir(resolved, { recursive: true });
-        resolvedDirs.push(resolved);
-      }
+async function resolveDirs(pathsArray) {
+  const resolvedDirs = [];
+  for (const p of pathsArray) {
+    if (fg__default.isDynamicPattern(p)) {
+      const matches = await fg__default(p, { onlyDirectories: true, absolute: true });
+      resolvedDirs.push(...matches);
+    } else {
+      const resolved = path__default.resolve(p);
+      if (!fs__default.existsSync(resolved))
+        await fs__default.promises.mkdir(resolved, { recursive: true });
+      resolvedDirs.push(resolved);
     }
-    const entities = {};
-    const entityFilePaths = {};
-    const entityDirs = {};
-    for (const dir of resolvedDirs) {
-      const entries = await fs__default.promises.readdir(dir, { withFileTypes: true });
-      for (const entry of entries) {
-        if (!entry.isFile() || !entry.name.endsWith(".ts"))
-          continue;
-        const filePath = path__default.join(dir, entry.name);
-        const content = await fs__default.promises.readFile(filePath, "utf-8");
-        if (!content.includes("@entity"))
-          continue;
-        const stem = entry.name.slice(0, -3);
-        if (entities[stem]) {
-          throw new Error(
-            `Entity name collision: "${stem}" is defined in multiple locations:
+  }
+  return resolvedDirs;
+}
+async function scanDirs(resolvedDirs) {
+  const entities = {};
+  const entityFilePaths = {};
+  const entityDirs = {};
+  for (const dir of resolvedDirs) {
+    const entries = await fs__default.promises.readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isFile() || !entry.name.endsWith(".ts"))
+        continue;
+      const filePath = path__default.join(dir, entry.name);
+      const content = await fs__default.promises.readFile(filePath, "utf-8");
+      const stem = entry.name.slice(0, -3);
+      const hasEntity = content.includes("@entity");
+      if (hasEntity && entityFilePaths[stem]) {
+        throw new Error(
+          `Entity name collision: "${stem}" is defined in multiple locations:
   ${entityFilePaths[stem]}
   ${filePath}`
-          );
-        }
-        entities[stem] = content;
+        );
+      }
+      entities[stem] = content;
+      if (hasEntity) {
         entityFilePaths[stem] = filePath;
         entityDirs[stem] = dir;
       }
     }
-    if (options?.entityRules?.length) {
-      const resolvedRules = await Promise.all(
-        options.entityRules.map(async (rule) => {
-          const rulePaths = Array.isArray(rule.path) ? rule.path : [rule.path];
-          const dirs = await expandToDirectories(rulePaths);
-          return { rule, dirs };
-        })
-      );
-      for (const [stem, filePath] of Object.entries(entityFilePaths)) {
-        const entityDir = entityDirs[stem];
-        for (const { rule, dirs } of resolvedRules) {
-          const applies = dirs.some((d) => entityDir === d || entityDir.startsWith(d + path__default.sep));
-          if (!applies)
-            continue;
-          if (rule.namePrefix && !stem.startsWith(rule.namePrefix)) {
-            throw new Error(`Entity "${stem}" at "${filePath}" must have name prefix "${rule.namePrefix}"`);
-          }
-          if (rule.validate) {
-            const error = rule.validate(stem, filePath);
-            if (error)
-              throw new Error(error);
-          }
-        }
+  }
+  return { entities, entityFilePaths, entityDirs };
+}
+async function validateEntityRules(entityFilePaths, entityDirs, entityRules) {
+  const resolvedRules = await Promise.all(
+    entityRules.map(async (rule) => {
+      const rulePaths = Array.isArray(rule.path) ? rule.path : [rule.path];
+      const dirs = await expandToDirectories(rulePaths);
+      return { rule, dirs };
+    })
+  );
+  for (const [stem, filePath] of Object.entries(entityFilePaths)) {
+    const entityDir = entityDirs[stem];
+    for (const { rule, dirs } of resolvedRules) {
+      const applies = dirs.some((d) => entityDir === d || entityDir.startsWith(d + path__default.sep));
+      if (!applies)
+        continue;
+      if (rule.namePrefix && !stem.startsWith(rule.namePrefix)) {
+        throw new Error(`Entity "${stem}" at "${filePath}" must have name prefix "${rule.namePrefix}"`);
       }
+      if (rule.validate) {
+        const error = rule.validate(stem, filePath);
+        if (error)
+          throw new Error(error);
+      }
+    }
+  }
+}
+function schemaFromFiles(paths, options) {
+  return async () => {
+    const pathsArray = Array.isArray(paths) ? paths : [paths];
+    const resolvedDirs = await resolveDirs(pathsArray);
+    const { entities, entityFilePaths, entityDirs } = await scanDirs(resolvedDirs);
+    if (options?.entityRules?.length) {
+      await validateEntityRules(entityFilePaths, entityDirs, options.entityRules);
     }
     const isSingleLiteralPath = pathsArray.length === 1 && !fg__default.isDynamicPattern(pathsArray[0]);
     const entitiesDir = isSingleLiteralPath ? pathsArray[0] : void 0;

package/dist/config.mjs

@@ -603,70 +603,82 @@ async function expandToDirectories(patterns) {
   }
   return dirs;
 }
-function schemaFromFiles(paths, options) {
-  return async () => {
-    const pathsArray = Array.isArray(paths) ? paths : [paths];
-    const resolvedDirs = [];
-    for (const p of pathsArray) {
-      if (fg.isDynamicPattern(p)) {
-        const matches = await fg(p, { onlyDirectories: true, absolute: true });
-        resolvedDirs.push(...matches);
-      } else {
-        const resolved = path.resolve(p);
-        if (!fs.existsSync(resolved))
-          await fs.promises.mkdir(resolved, { recursive: true });
-        resolvedDirs.push(resolved);
-      }
+async function resolveDirs(pathsArray) {
+  const resolvedDirs = [];
+  for (const p of pathsArray) {
+    if (fg.isDynamicPattern(p)) {
+      const matches = await fg(p, { onlyDirectories: true, absolute: true });
+      resolvedDirs.push(...matches);
+    } else {
+      const resolved = path.resolve(p);
+      if (!fs.existsSync(resolved))
+        await fs.promises.mkdir(resolved, { recursive: true });
+      resolvedDirs.push(resolved);
     }
-    const entities = {};
-    const entityFilePaths = {};
-    const entityDirs = {};
-    for (const dir of resolvedDirs) {
-      const entries = await fs.promises.readdir(dir, { withFileTypes: true });
-      for (const entry of entries) {
-        if (!entry.isFile() || !entry.name.endsWith(".ts"))
-          continue;
-        const filePath = path.join(dir, entry.name);
-        const content = await fs.promises.readFile(filePath, "utf-8");
-        if (!content.includes("@entity"))
-          continue;
-        const stem = entry.name.slice(0, -3);
-        if (entities[stem]) {
-          throw new Error(
-            `Entity name collision: "${stem}" is defined in multiple locations:
+  }
+  return resolvedDirs;
+}
+async function scanDirs(resolvedDirs) {
+  const entities = {};
+  const entityFilePaths = {};
+  const entityDirs = {};
+  for (const dir of resolvedDirs) {
+    const entries = await fs.promises.readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isFile() || !entry.name.endsWith(".ts"))
+        continue;
+      const filePath = path.join(dir, entry.name);
+      const content = await fs.promises.readFile(filePath, "utf-8");
+      const stem = entry.name.slice(0, -3);
+      const hasEntity = content.includes("@entity");
+      if (hasEntity && entityFilePaths[stem]) {
+        throw new Error(
+          `Entity name collision: "${stem}" is defined in multiple locations:
   ${entityFilePaths[stem]}
   ${filePath}`
-          );
-        }
-        entities[stem] = content;
+        );
+      }
+      entities[stem] = content;
+      if (hasEntity) {
         entityFilePaths[stem] = filePath;
         entityDirs[stem] = dir;
       }
     }
-    if (options?.entityRules?.length) {
-      const resolvedRules = await Promise.all(
-        options.entityRules.map(async (rule) => {
-          const rulePaths = Array.isArray(rule.path) ? rule.path : [rule.path];
-          const dirs = await expandToDirectories(rulePaths);
-          return { rule, dirs };
-        })
-      );
-      for (const [stem, filePath] of Object.entries(entityFilePaths)) {
-        const entityDir = entityDirs[stem];
-        for (const { rule, dirs } of resolvedRules) {
-          const applies = dirs.some((d) => entityDir === d || entityDir.startsWith(d + path.sep));
-          if (!applies)
-            continue;
-          if (rule.namePrefix && !stem.startsWith(rule.namePrefix)) {
-            throw new Error(`Entity "${stem}" at "${filePath}" must have name prefix "${rule.namePrefix}"`);
-          }
-          if (rule.validate) {
-            const error = rule.validate(stem, filePath);
-            if (error)
-              throw new Error(error);
-          }
-        }
+  }
+  return { entities, entityFilePaths, entityDirs };
+}
+async function validateEntityRules(entityFilePaths, entityDirs, entityRules) {
+  const resolvedRules = await Promise.all(
+    entityRules.map(async (rule) => {
+      const rulePaths = Array.isArray(rule.path) ? rule.path : [rule.path];
+      const dirs = await expandToDirectories(rulePaths);
+      return { rule, dirs };
+    })
+  );
+  for (const [stem, filePath] of Object.entries(entityFilePaths)) {
+    const entityDir = entityDirs[stem];
+    for (const { rule, dirs } of resolvedRules) {
+      const applies = dirs.some((d) => entityDir === d || entityDir.startsWith(d + path.sep));
+      if (!applies)
+        continue;
+      if (rule.namePrefix && !stem.startsWith(rule.namePrefix)) {
+        throw new Error(`Entity "${stem}" at "${filePath}" must have name prefix "${rule.namePrefix}"`);
       }
+      if (rule.validate) {
+        const error = rule.validate(stem, filePath);
+        if (error)
+          throw new Error(error);
+      }
+    }
+  }
+}
+function schemaFromFiles(paths, options) {
+  return async () => {
+    const pathsArray = Array.isArray(paths) ? paths : [paths];
+    const resolvedDirs = await resolveDirs(pathsArray);
+    const { entities, entityFilePaths, entityDirs } = await scanDirs(resolvedDirs);
+    if (options?.entityRules?.length) {
+      await validateEntityRules(entityFilePaths, entityDirs, options.entityRules);
     }
     const isSingleLiteralPath = pathsArray.length === 1 && !fg.isDynamicPattern(pathsArray[0]);
     const entitiesDir = isSingleLiteralPath ? pathsArray[0] : void 0;

package/integrations/node.cjs

@@ -174,7 +174,7 @@ function getEntityTypesStrFromSchema(schema) {
         if (type.isExtending && schema[type.isExtending]?.fields?.[f.name]) return "";
         let fieldTypeStr = f.type;
         if (f.isChange) fieldTypeStr = `Change<${fieldTypeStr}>`;
-        if (f.isRelation) fieldTypeStr = `Relation<${fieldTypeStr}>`;
+        if (f.isRelation) fieldTypeStr = `Relation<${fieldTypeStr}${f.relationDenormFields?.length ? `, ${f.relationDenormFields.map(x => `'${x}'`).join(" | ")}` : ""}>`;
         if (f.isArray) fieldTypeStr = `${fieldTypeStr}[]`;
         const fieldStr = `  ${f.name}${f.isRequired ? "" : "?"}: ${fieldTypeStr}`;
         const commentStr2 = f.comment ? `  /** ${f.comment} */` : "";

package/integrations/node.mjs

@@ -185,7 +185,8 @@ export function getEntityTypesStrFromSchema(schema) {
         if (type.isExtending && schema[type.isExtending]?.fields?.[f.name]) return "";
         let fieldTypeStr = f.type;
         if (f.isChange) fieldTypeStr = `Change<${fieldTypeStr}>`;
-        if (f.isRelation) fieldTypeStr = `Relation<${fieldTypeStr}>`;
+        if (f.isRelation)
+          fieldTypeStr = `Relation<${fieldTypeStr}${f.relationDenormFields?.length ? `, ${f.relationDenormFields.map((x) => `'${x}'`).join(" | ")}` : ""}>`;
         if (f.isArray) fieldTypeStr = `${fieldTypeStr}[]`;
         const fieldStr = `  ${f.name}${f.isRequired ? "" : "?"}: ${fieldTypeStr}`;
         const commentStr2 = f.comment ? `  /** ${f.comment} */` : "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.2.37",
+  "version": "3.2.39",
   "description": "Say goodbye to boilerplate code and hello to efficient and elegant syntax.",
   "author": "",
   "license": "ISC",