rads-db 3.1.9 → 3.1.11

package/fileUploadDrivers/supabaseStorage.mjs

@@ -1,7 +1,6 @@
 export default (options) => {
   const { supabase } = options || {};
-  if (!supabase)
-    throw new Error(`Please provide supabase client and bucket name`);
+  if (!supabase) throw new Error(`Please provide supabase client and bucket name`);
   const defaultBucket = options.defaultBucket || "files";
   const driver = {
     driverName: "supabase",
@@ -11,11 +10,9 @@ export default (options) => {
         ...options.uploadOptions,
         ...args.options
       });
-      if (error)
-        throw error;
+      if (error) throw error;
       const resultPath = data?.path;
-      if (!resultPath)
-        return { url: resultPath };
+      if (!resultPath) return { url: resultPath };
       return { url: bucketClient.getPublicUrl(resultPath).data.publicUrl };
     }
   };

package/integrations/node.cjs

@@ -12,7 +12,7 @@ var _nodeFs = _interopRequireDefault(require("node:fs"));
 var _nodePath = _interopRequireDefault(require("node:path"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _jiti = require("jiti");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 async function generateClient() {
   console.time('"node_modules/_rads-db" generated in');
   const config = await loadConfig();
@@ -270,7 +270,7 @@ function getWhereFieldsForPrimitive(schema, type, fieldKey) {
   throw new Error(`Unknown primitive type: ${field.type}`);
 }
 function getWhereFieldsForString(name) {
-  return [`${name}_istartsWith?: string`, `${name}_startsWith?: string`, `${name}_icontains?: string`, `${name}_contains?: string`, `${name}_iendsWith?: string`, `${name}_endsWith?: string`, `${name}_gt?: string`, `${name}_gte?: string`, `${name}_lt?: string`, `${name}_lte?: string`];
+  return [`${name}_ieq?: string`, `${name}_istartsWith?: string`, `${name}_startsWith?: string`, `${name}_icontains?: string`, `${name}_contains?: string`, `${name}_iendsWith?: string`, `${name}_endsWith?: string`, `${name}_gt?: string`, `${name}_gte?: string`, `${name}_lt?: string`, `${name}_lte?: string`];
 }
 function getStringHashCode(str) {
   if (!str) return 0;

package/integrations/node.mjs

@@ -52,8 +52,7 @@ async function loadConfig() {
   let config;
   for (const p of paths) {
     config = await jiti.import(p, { try: true });
-    if (config)
-      break;
+    if (config) break;
   }
   if (!config) {
     throw new Error(
@@ -99,8 +98,7 @@ export function getIndexDtsInner(schema, rootTypeName, entitiesDir) {
   const schemaTypesStr = entitiesDir ? "" : getEntityTypesStrFromSchema(schema);
   for (const key in schema) {
     const type = schema[key];
-    if (!type.fields)
-      continue;
+    if (!type.fields) continue;
     if (entitiesDir && type.sourceFile) {
       imports.push(`import type { ${type.name} } from '../../${entitiesDir}/${type.sourceFile}'`);
     }
@@ -127,8 +125,7 @@ export function getIndexDtsInner(schema, rootTypeName, entitiesDir) {
   }
   for (const key in schema) {
     const type = schema[key];
-    if (!type.fields)
-      continue;
+    if (!type.fields) continue;
     const whereFields = getWhereFields(schema, type);
     whereTypes.push(
       `
@@ -183,15 +180,11 @@ export function getEntityTypesStrFromSchema(schema) {
     } else {
       const fields = Object.values(type.fields);
       const fieldsStr = fields.map((f) => {
-        if (type.isExtending && schema[type.isExtending]?.fields?.[f.name])
-          return "";
+        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.isArray)
-          fieldTypeStr = `${fieldTypeStr}[]`;
+        if (f.isChange) fieldTypeStr = `Change<${fieldTypeStr}>`;
+        if (f.isRelation) fieldTypeStr = `Relation<${fieldTypeStr}>`;
+        if (f.isArray) fieldTypeStr = `${fieldTypeStr}[]`;
         const fieldStr = `  ${f.name}${f.isRequired ? "" : "?"}: ${fieldTypeStr}`;
         const commentStr2 = f.comment ? `  /** ${f.comment} */` : "";
         return [fieldStr, commentStr2].filter((x) => x).join("\n");
@@ -226,8 +219,7 @@ function getWhereFieldsFor(schema, type, fieldKey) {
   const { isRelation, isRequired, isArray, isChange } = field;
   if (isArray) {
     const arrayWhereFields = [`${name}_isEmpty?: boolean`];
-    if (!isRequired)
-      arrayWhereFields.push(`${name}_isNull?: boolean`);
+    if (!isRequired) arrayWhereFields.push(`${name}_isNull?: boolean`);
     if (isPrimitive || isEnum) {
       return [`${name}_arrayContains?: ${fieldTypeName}`, ...arrayWhereFields];
     }
@@ -240,8 +232,7 @@ function getWhereFieldsFor(schema, type, fieldKey) {
     throw new Error(`Unknown array type: ${fieldTypeName}`);
   }
   const commonWhereFields = [];
-  if (!isRequired)
-    commonWhereFields.push(`${name}_isNull?: boolean`);
+  if (!isRequired) commonWhereFields.push(`${name}_isNull?: boolean`);
   if (isRelation) {
     return [`${name}?: ${getRelationWhereType()}`, ...commonWhereFields];
   }
@@ -298,6 +289,7 @@ function getWhereFieldsForPrimitive(schema, type, fieldKey) {
 }
 function getWhereFieldsForString(name) {
   return [
+    `${name}_ieq?: string`,
     `${name}_istartsWith?: string`,
     `${name}_startsWith?: string`,
     `${name}_icontains?: string`,
@@ -311,12 +303,10 @@ function getWhereFieldsForString(name) {
   ];
 }
 function getStringHashCode(str) {
-  if (!str)
-    return 0;
+  if (!str) return 0;
   let hash = 0;
   let chr;
-  if (str.length === 0)
-    return hash;
+  if (str.length === 0) return hash;
   for (let i = 0; i < str.length; i++) {
     chr = str.charCodeAt(i);
     hash = (hash << 5) - hash + chr;

package/integrations/nuxtModule.cjs

@@ -3,6 +3,5 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-module.exports = void 0;
-var _default = {};
-module.exports = _default;
+
+module.exports = {};

package/integrations/restEndpoints.cjs

@@ -9,7 +9,7 @@ exports.getRestRoutes = getRestRoutes;
 var _h = require("h3");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _restEndpointsDev = _interopRequireDefault(require("./restEndpointsDev.cjs"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function getRadsUiUser(radsAuthHeader, apiKey) {
   if (!radsAuthHeader) return void 0;
   apiKey = apiKey || process.env.RadsApiKey;

package/integrations/restEndpoints.mjs

@@ -2,8 +2,7 @@ import { createError } from "h3";
 import _ from "lodash";
 import restEndpointsDev from "./restEndpointsDev.mjs";
 export function getRadsUiUser(radsAuthHeader, apiKey) {
-  if (!radsAuthHeader)
-    return void 0;
+  if (!radsAuthHeader) return void 0;
   apiKey = apiKey || process.env.RadsApiKey;
   if (!apiKey) {
     throw createError({ statusCode: 401, message: `Please, provide "apiKey" option to "getRadsUiUser" call.` });
@@ -30,8 +29,7 @@ export function getRestRoutes(options) {
   routes[`${prefix}uploadFile`] = { POST: getUploadFileHandler(db) };
   for (const key in schema) {
     const entity = schema[key];
-    if (!entity.decorators?.entity)
-      continue;
+    if (!entity.decorators?.entity) continue;
     routes[`${prefix}${entity.handle}`] = {
       POST: (args, ctx) => db[entity.handle].get(args.body, ctx),
       PUT: (args, ctx) => db[entity.handle].put(args.body?.data, ctx)
@@ -73,8 +71,7 @@ export function getRadsTunnelHandler(options) {
   const handlers = {
     uploadFile: ({ uploadArgs }, ctx) => {
       const blob = getBlobFromDataUrl(uploadArgs?.blobDataUrl);
-      if (!blob)
-        throw createError({ statusCode: 400, message: 'Malformed request - "blobDataUrl" is required' });
+      if (!blob) throw createError({ statusCode: 400, message: 'Malformed request - "blobDataUrl" is required' });
       return db.uploadFile({ blob, ...uploadArgs }, ctx);
     },
     _schema: () => db._schema,
@@ -84,24 +81,19 @@ export function getRadsTunnelHandler(options) {
   };
   return async function radsTunnelHandler(request, ctx) {
     const { method, entity, args } = request?.body || {};
-    if (!method)
-      throw createError({ statusCode: 400, message: "Malformed request - missing method" });
+    if (!method) throw createError({ statusCode: 400, message: "Malformed request - missing method" });
     const handler = handlers[method];
-    if (handler)
-      return handler(request?.body || {}, ctx);
+    if (handler) return handler(request?.body || {}, ctx);
     if (exposeFilesystem && method.startsWith("fs:")) {
       const fsMethod = method.slice(3);
       const devHandler = restEndpointsDev[fsMethod];
-      if (devHandler)
-        return devHandler(...args);
+      if (devHandler) return devHandler(...args);
     }
     if (!method || !entity)
       throw createError({ statusCode: 400, message: 'Malformed request - missing "method" or "entity"' });
     const handle = db[_.lowerFirst(entity)];
-    if (!handle)
-      throw createError({ statusCode: 400, message: `Malformed request - entity "${entity}" not found` });
-    if (!handle[method])
-      throw createError({ statusCode: 400, message: `Unknown method - ${method}` });
+    if (!handle) throw createError({ statusCode: 400, message: `Malformed request - entity "${entity}" not found` });
+    if (!handle[method]) throw createError({ statusCode: 400, message: `Unknown method - ${method}` });
     return await handle[method](args, ctx);
   };
 }

package/integrations/restEndpointsDev/restEndpointsDevLint.cjs

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-module.exports = void 0;
+
 let eslint;
 let wasEslintImported = false;
 let importEslintPromise;
-var _default = {
+module.exports = {
   async lint(args) {
     const {
       text,
@@ -33,7 +33,6 @@ var _default = {
     };
   }
 };
-module.exports = _default;
 function importEslint() {
   if (!importEslintPromise) importEslintPromise = importEslintInner();
   return importEslintPromise;

package/integrations/restEndpointsDev/restEndpointsDevLint.d.ts

@@ -2,7 +2,7 @@ declare const _default: {
     lint(args?: {
         filepath: string;
         text: string;
-    } | undefined): Promise<{
+    }): Promise<{
         text: string;
         messages?: undefined;
     } | {

package/integrations/restEndpointsDev/restEndpointsDevLint.mjs

@@ -4,27 +4,22 @@ let importEslintPromise;
 export default {
   async lint(args) {
     const { text, filepath } = args || {};
-    if (!text || !filepath)
-      return;
+    if (!text || !filepath) return;
     await importEslint();
-    if (!eslint)
-      return;
+    if (!eslint) return;
     const result = await eslint.lintText(text, { filePath: filepath });
     const fileResult = result?.[0];
-    if (!fileResult)
-      return { text };
+    if (!fileResult) return { text };
     const { messages, output } = fileResult;
     return { messages, text: output || text };
   }
 };
 function importEslint() {
-  if (!importEslintPromise)
-    importEslintPromise = importEslintInner();
+  if (!importEslintPromise) importEslintPromise = importEslintInner();
   return importEslintPromise;
 }
 async function importEslintInner() {
-  if (wasEslintImported)
-    return;
+  if (wasEslintImported) return;
   try {
     try {
       const eslintModule = await import("eslint/use-at-your-own-risk");

package/integrations/restEndpointsDev.cjs

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-module.exports = void 0;
+
 var _promises = _interopRequireDefault(require("node:fs/promises"));
 var _nodePath = _interopRequireDefault(require("node:path"));
 var _klaw = _interopRequireDefault(require("klaw"));
 var _ignore = _interopRequireDefault(require("ignore"));
 var _restEndpointsDevLint = _interopRequireDefault(require("./restEndpointsDev/restEndpointsDevLint.cjs"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 let gitignore;
 const root = _nodePath.default.resolve(".");
-var _default = {
+module.exports = {
   lint: _restEndpointsDevLint.default.lint,
   async mkdir(filepath, options) {
     sanitizeFilepath(filepath);
@@ -84,7 +84,6 @@ var _default = {
     return await _promises.default.rename(oldFilepath, newFilepath);
   }
 };
-module.exports = _default;
 async function dirExists(path2) {
   try {
     await _promises.default.access(path2);

package/integrations/restEndpointsDev.d.ts

@@ -3,7 +3,7 @@ declare const _default: {
     lint: (args?: {
         filepath: string;
         text: string;
-    } | undefined) => Promise<{
+    }) => Promise<{
         text: string;
         messages?: undefined;
     } | {

package/integrations/restEndpointsDev.mjs

@@ -24,8 +24,7 @@ export default {
     try {
       return await readdirRecursive(filepath, options);
     } catch (e) {
-      if (e.code === "ENOENT")
-        return [];
+      if (e.code === "ENOENT") return [];
       throw e;
     }
   },
@@ -34,8 +33,7 @@ export default {
     let result;
     if (options?.lint) {
       result = await restEndpointsDevLint.lint({ filepath: options.lintFilepath || filepath, text: data });
-      if (result?.text)
-        data = result.text;
+      if (result?.text) data = result.text;
     }
     const dirname = path.dirname(filepath);
     const isExistingDir = await dirExists(dirname);
@@ -50,8 +48,7 @@ export default {
     try {
       return await fs.readFile(filepath, options);
     } catch (e) {
-      if (e.code === "ENOENT")
-        return null;
+      if (e.code === "ENOENT") return null;
       throw e;
     }
   },
@@ -60,8 +57,7 @@ export default {
     try {
       return await fs.lstat(filepath, options);
     } catch (e) {
-      if (e.code === "ENOENT")
-        return void 0;
+      if (e.code === "ENOENT") return void 0;
       throw e;
     }
   },
@@ -86,8 +82,7 @@ async function dirExists(path2) {
 }
 function sanitizeFilepath(filepath) {
   const result = path.resolve(filepath);
-  if (!result.startsWith(root))
-    throw new Error("Invalid path");
+  if (!result.startsWith(root)) throw new Error("Invalid path");
 }
 async function readdirRecursive(dir, options) {
   await initGitignore();
@@ -102,11 +97,9 @@ async function readdirRecursive(dir, options) {
   });
   const results = [];
   for await (const file of klawIterator) {
-    if (file.stats.isSymbolicLink())
-      continue;
+    if (file.stats.isSymbolicLink()) continue;
     const rp = path.relative(dir, file.path).replaceAll("\\", "/");
-    if (!rp)
-      continue;
+    if (!rp) continue;
     results.push({
       path: `./${rp}`,
       type: file.stats.isDirectory() ? "tree" : "blob",
@@ -116,10 +109,8 @@ async function readdirRecursive(dir, options) {
   return results;
 }
 async function initGitignore() {
-  if (gitignore)
-    return;
+  if (gitignore) return;
   const gitignoreStr = await fs.readFile("./.gitignore", "utf-8");
   gitignore = ignore().add(["node_modules", ".git"]);
-  if (gitignoreStr)
-    gitignore = gitignore.add(gitignoreStr.split("\n").filter((x) => x));
+  if (gitignoreStr) gitignore = gitignore.add(gitignoreStr.split("\n").filter((x) => x));
 }

package/integrations/restEndpointsDev2.cjs

@@ -3,14 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-module.exports = void 0;
+
 var _promises = _interopRequireDefault(require("node:fs/promises"));
 var _nodePath = _interopRequireDefault(require("node:path"));
 var _klaw = _interopRequireDefault(require("klaw"));
 var _ignore = _interopRequireDefault(require("ignore"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 let gitignore;
-var _default = {
+module.exports = {
   async fsGetFileTree() {
     const results = [];
     await ensureGitignoreCreated();
@@ -47,7 +47,6 @@ var _default = {
     return {};
   }
 };
-module.exports = _default;
 async function ensureGitignoreCreated() {
   if (gitignore) return;
   const gitignoreStr = await _promises.default.readFile("./.gitignore", "utf-8");

package/integrations/restEndpointsDev2.d.ts

@@ -1,4 +1,3 @@
-import path from 'node:path';
 declare const _default: {
     fsGetFileTree(): Promise<any[]>;
     fsGetBlobContent(args: {

package/integrations/restEndpointsDev2.mjs

@@ -12,14 +12,12 @@ export default {
       preserveSymlinks: true,
       filter: (p) => {
         const rp = path.relative(".", p);
-        if (rp.startsWith(".git"))
-          return false;
+        if (rp.startsWith(".git")) return false;
         return !gitignore.ignores(rp);
       }
     });
     for await (const file of klawIterator) {
-      if (file.stats.isSymbolicLink())
-        continue;
+      if (file.stats.isSymbolicLink()) continue;
       const rp = path.relative(".", file.path);
       results.push({
         sha: rp,
@@ -41,8 +39,7 @@ export default {
   }
 };
 async function ensureGitignoreCreated() {
-  if (gitignore)
-    return;
+  if (gitignore) return;
   const gitignoreStr = await fs.readFile("./.gitignore", "utf-8");
   gitignore = ignore().add(gitignoreStr.split("\n").filter((x) => x));
 }

package/integrations/vite.mjs

@@ -24,13 +24,11 @@ export function radsDbVite(options) {
       }
     }
   ];
-  if (options?.exposeModulesInDev)
-    result.push(exposeModulesPlugin(options.exposeModulesInDev));
+  if (options?.exposeModulesInDev) result.push(exposeModulesPlugin(options.exposeModulesInDev));
   return result;
 }
 function exposeModulesPlugin(regex) {
-  if (regex === true)
-    regex = /\/src\/((services|stores)\/(.+))\.[tj]s$/i;
+  if (regex === true) regex = /\/src\/((services|stores)\/(.+))\.[tj]s$/i;
   const regexInner = regex;
   return {
     name: "expose-modules-in-dev",
@@ -39,8 +37,7 @@ function exposeModulesPlugin(regex) {
       const match = regexInner.exec(id);
       if (match) {
         let modifiedSrc = src.replace("export default ", "const _exportDefault = ");
-        if (modifiedSrc.length === src.length)
-          return;
+        if (modifiedSrc.length === src.length) return;
         const propName = match[1];
         const props = propName.split("/");
         const propsPathStr = props.slice(0, -1).map((p) => `'${p}'`).join(",");

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.1.9",
-  "packageManager": "pnpm@8.6.1",
+  "version": "3.1.11",
   "description": "Say goodbye to boilerplate code and hello to efficient and elegant syntax.",
   "author": "",
   "license": "ISC",
@@ -113,6 +112,7 @@
     "generate-test-schema": "jiti ./src/integrations/cli",
     "dev": "pnpm install && pnpm link-rads-db && pnpm build && pnpm generate-test-schema && vitest --ui --test-timeout 300000 --typecheck",
     "lint": "cross-env NODE_ENV=production eslint src/**/*.* test/**/*.*",
+    "typecheck": "tsc --noEmit",
     "build": "unbuild"
   }
 }