rads-db 3.0.31 → 3.0.32

package/integrations/lib.cjs

@@ -138,7 +138,7 @@ function fillComputedDefinitionsForType(result) {
     const precomputedFields = _lodash.default.values(fields).filter(f => !!f.decorators?.precomputed).sort((f1, f2) => getOrder(f1) - getOrder(f2)).map(f => f.name);
     const computedFields = _lodash.default.values(fields).filter(f => !!f.decorators?.computed).sort((f1, f2) => getOrder(f1) - getOrder(f2)).map(f => f.name);
     const nestedTypeFields = _lodash.default.values(fields).filter(f => result[f.type] && result[f.type].fields && !result[f.type].decorators.entity).map(f => f.name);
-    const keepHistoryFields = _lodash.default.values(fields).filter(f => !!f.decorators?.keepHistory).sort((f1, f2) => getOrder(f1) - getOrder(f2)).map(f => f.name);
+    const keepHistoryFields = _lodash.default.values(fields).filter(f => !!f.decorators?.keepHistory).map(f => f.name);
     if (precomputedFields.length) type.precomputedFields = precomputedFields;
     if (computedFields.length) type.computedFields = computedFields;
     if (nestedTypeFields.length) type.nestedTypeFields = nestedTypeFields;

package/integrations/lib.mjs

@@ -112,7 +112,7 @@ function fillComputedDefinitionsForType(result) {
     const precomputedFields = _.values(fields).filter((f) => !!f.decorators?.precomputed).sort((f1, f2) => getOrder(f1) - getOrder(f2)).map((f) => f.name);
     const computedFields = _.values(fields).filter((f) => !!f.decorators?.computed).sort((f1, f2) => getOrder(f1) - getOrder(f2)).map((f) => f.name);
     const nestedTypeFields = _.values(fields).filter((f) => result[f.type] && result[f.type].fields && !result[f.type].decorators.entity).map((f) => f.name);
-    const keepHistoryFields = _.values(fields).filter((f) => !!f.decorators?.keepHistory).sort((f1, f2) => getOrder(f1) - getOrder(f2)).map((f) => f.name);
+    const keepHistoryFields = _.values(fields).filter((f) => !!f.decorators?.keepHistory).map((f) => f.name);
     if (precomputedFields.length)
       type.precomputedFields = precomputedFields;
     if (computedFields.length)

package/integrations/node.cjs

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.generateClient = generateClient;
+exports.getEntityTypesStrFromSchema = getEntityTypesStrFromSchema;
 exports.getIndexDts = getIndexDts;
 exports.getSchema = getSchema;
 var _promises = _interopRequireDefault(require("node:fs/promises"));
@@ -31,9 +32,10 @@ exports.schema=${JSON.stringify(schema)}
   const indexMjsText = `
 export const schema = ${JSON.stringify(schema)}
 `.trim();
+  const indexDtsText = getIndexDts(schema, normalizedOptions);
   await _promises.default.writeFile(_nodePath.default.join(radsDbPath, "./index.js"), indexJsText);
   await _promises.default.writeFile(_nodePath.default.join(radsDbPath, "./index.mjs"), indexMjsText);
-  await _promises.default.writeFile(_nodePath.default.join(radsDbPath, "./index.d.ts"), getIndexDts(schema, normalizedOptions));
+  await _promises.default.writeFile(_nodePath.default.join(radsDbPath, "./index.d.ts"), indexDtsText);
   await _promises.default.writeFile(_nodePath.default.join(radsDbPath, "./package.json"), JSON.stringify({
     name: "_rads-db",
     main: "./index.js",
@@ -95,10 +97,13 @@ function getIndexDts(schema, options) {
   const rootFields = [];
   const whereTypes = [];
   const entityMeta = [];
+  const schemaTypesStr = options.entitiesDir ? "" : getEntityTypesStrFromSchema(schema);
   for (const key in schema) {
     const type = schema[key];
-    if (!type.fields) continue;
-    imports.push(`import type { ${type.name} } from '../../${options.entitiesDir}/${key}'`);
+    if (!type.decorators.entity) continue;
+    if (options.entitiesDir) {
+      imports.push(`import type { ${type.name} } from '../../${options.entitiesDir}/${key}'`);
+    }
     rootFields.push(`${type.handle}: EntityMethods<${type.name}, '${type.name}', ${type.name}_Where>`);
     const fieldsArray = Object.values(type.fields);
     const relations = _lodash.default.fromPairs(fieldsArray.filter(f => f.isRelation).map(f => [f.name, {
@@ -111,6 +116,10 @@ function getIndexDts(schema, options) {
       aggregates: fieldsArray.filter(f => f.type === "number" && !f.isArray).map(x => `'${x.name}'`).join(" | "),
       primitives: fieldsArray.filter(f => !schema[f.type]?.decorators?.entity).map(x => `'${x.name}'`).join(" | ")
     });
+  }
+  for (const key in schema) {
+    const type = schema[key];
+    if (!type.fields) continue;
     const whereFields = getWhereFields(schema, type);
     whereTypes.push(`
 export interface ${type.name}_Where {
@@ -128,6 +137,7 @@ ${whereFields.join("\n")}
   return `
 import type { EntityMethods, FileUploadArgs, RadsRequestContext } from 'rads-db'
 ${imports.join("\n")}
+${schemaTypesStr}
 
 export interface EntityMeta {
   ${entityMetaStr}
@@ -147,6 +157,9 @@ export interface RadsDb {
 }
   `.trim();
 }
+function getEntityTypesStrFromSchema(schema) {
+  return "";
+}
 function getWhereFields(schema, type) {
   const result = [];
   for (const f in type.fields) {

package/integrations/node.d.ts

@@ -2,3 +2,4 @@ import type { GenerateClientNormalizedOptions, GenerateClientOptions, Schema } f
 export declare function generateClient(options?: GenerateClientOptions): Promise<void>;
 export declare function getSchema(normalizedOptions: GenerateClientNormalizedOptions): Promise<any>;
 export declare function getIndexDts(schema: Schema, options: GenerateClientNormalizedOptions): string;
+export declare function getEntityTypesStrFromSchema(schema: Schema): string;

package/integrations/node.mjs

@@ -24,9 +24,10 @@ exports.schema=${JSON.stringify(schema)}
   const indexMjsText = `
 export const schema = ${JSON.stringify(schema)}
 `.trim();
+  const indexDtsText = getIndexDts(schema, normalizedOptions);
   await fs.writeFile(path.join(radsDbPath, "./index.js"), indexJsText);
   await fs.writeFile(path.join(radsDbPath, "./index.mjs"), indexMjsText);
-  await fs.writeFile(path.join(radsDbPath, "./index.d.ts"), getIndexDts(schema, normalizedOptions));
+  await fs.writeFile(path.join(radsDbPath, "./index.d.ts"), indexDtsText);
   await fs.writeFile(
     path.join(radsDbPath, "./package.json"),
     JSON.stringify(
@@ -88,11 +89,14 @@ export function getIndexDts(schema, options) {
   const rootFields = [];
   const whereTypes = [];
   const entityMeta = [];
+  const schemaTypesStr = options.entitiesDir ? "" : getEntityTypesStrFromSchema(schema);
   for (const key in schema) {
     const type = schema[key];
-    if (!type.fields)
+    if (!type.decorators.entity)
       continue;
-    imports.push(`import type { ${type.name} } from '../../${options.entitiesDir}/${key}'`);
+    if (options.entitiesDir) {
+      imports.push(`import type { ${type.name} } from '../../${options.entitiesDir}/${key}'`);
+    }
     rootFields.push(`${type.handle}: EntityMethods<${type.name}, '${type.name}', ${type.name}_Where>`);
     const fieldsArray = Object.values(type.fields);
     const relations = _.fromPairs(
@@ -109,6 +113,11 @@ export function getIndexDts(schema, options) {
       aggregates: fieldsArray.filter((f) => f.type === "number" && !f.isArray).map((x) => `'${x.name}'`).join(" | "),
       primitives: fieldsArray.filter((f) => !schema[f.type]?.decorators?.entity).map((x) => `'${x.name}'`).join(" | ")
     });
+  }
+  for (const key in schema) {
+    const type = schema[key];
+    if (!type.fields)
+      continue;
     const whereFields = getWhereFields(schema, type);
     whereTypes.push(
       `
@@ -130,6 +139,7 @@ ${whereFields.join("\n")}
   return `
 import type { EntityMethods, FileUploadArgs, RadsRequestContext } from 'rads-db'
 ${imports.join("\n")}
+${schemaTypesStr}
 
 export interface EntityMeta {
   ${entityMetaStr}
@@ -149,6 +159,9 @@ export interface RadsDb {
 }
   `.trim();
 }
+export function getEntityTypesStrFromSchema(schema) {
+  return "";
+}
 function getWhereFields(schema, type) {
   const result = [];
   for (const f in type.fields) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.0.31",
+  "version": "3.0.32",
   "files": [
     "dist",
     "drivers",
@@ -105,7 +105,7 @@
   "scripts": {
     "test": "vitest --run && vitest typecheck --run",
     "link-rads-db": "symlink-dir ./test/_rads-db ./node_modules/_rads-db",
-    "generate-test-schema": "rads-db",
+    "generate-test-schema": "rads-db -d './test/entities'",
     "dev": "pnpm install && pnpm link-rads-db && pnpm build && pnpm generate-test-schema && vitest --ui --test-timeout 300000",
     "lint": "cross-env NODE_ENV=production eslint src/**/*.* test/**/*.*",
     "dev-typecheck": "pnpm install && pnpm build && pnpm generate-test-schema && pnpm link-rads-db && vitest typecheck --ui",