orchid-orm 1.58.1 → 1.58.3

package/dist/migrations/node-postgres.d.ts

@@ -1,5 +1,4 @@
-import { ColumnSchemaConfig } from 'orchid-core';
-import { DefaultColumnTypes, DefaultSchemaConfig } from 'pqb';
+import { ColumnSchemaConfig, DefaultColumnTypes, DefaultSchemaConfig } from 'pqb';
 export * from 'rake-db/node-postgres';
 
 declare module 'rake-db' {

package/dist/migrations/node-postgres.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var rakeDb = require('rake-db');
-var orchidCore = require('orchid-core');
 var pqb = require('pqb');
 var path = require('node:path');
 var url = require('url');
@@ -25,7 +24,7 @@ const compareSqlExpressions = async (tableExpressions, adapter) => {
         `SELECT pg_get_viewdef('${viewName}') v`,
         `DROP VIEW ${viewName}`
       ].join("; ");
-      const result = await adapter.query(combinedQueries, values).then((res) => res[1], orchidCore.noop);
+      const result = await adapter.query(combinedQueries, values).then((res) => res[1], pqb.noop);
       if (!result) {
         handle();
         return;
@@ -80,20 +79,20 @@ const promptCreateOrRename = (kind, name, drop, verifying) => {
   }
   const renameMessage = `rename ${kind}`;
   return rakeDb.promptSelect({
-    message: `Create or rename ${orchidCore.colors.blueBold(
+    message: `Create or rename ${pqb.colors.blueBold(
       name
     )} ${kind} from another ${kind}?`,
     options: [
-      `${orchidCore.colors.greenBold("+")} ${name}  ${orchidCore.colors.pale(
+      `${pqb.colors.greenBold("+")} ${name}  ${pqb.colors.pale(
         `create ${kind}`.padStart(
           hintPos + renameMessage.length - name.length - 4,
           " "
         )
       )}`,
       ...drop.map(
-        (d) => `${orchidCore.colors.yellowBold("~")} ${d} ${orchidCore.colors.yellowBold(
+        (d) => `${pqb.colors.yellowBold("~")} ${d} ${pqb.colors.yellowBold(
           "=>"
-        )} ${name}  ${orchidCore.colors.pale(
+        )} ${name}  ${pqb.colors.pale(
           renameMessage.padStart(
             hintPos + renameMessage.length - d.length - name.length - 8,
             " "
@@ -335,7 +334,7 @@ const addOrRenameColumns = async (config, dbStructure, {
           dbName: from,
           column: column.name(codeName)
         });
-        const to = config.snakeCase ? orchidCore.toSnakeCase(key) : key;
+        const to = config.snakeCase ? pqb.toSnakeCase(key) : key;
         if (dbTableData.primaryKey) {
           renameColumn(dbTableData.primaryKey.columns, from, to);
         }
@@ -425,9 +424,9 @@ const changeColumns = async (adapter, config, structureToAstCtx, dbStructure, do
     } else if (action !== "recreate") {
       const to = codeColumn.data.name ?? codeKey;
       if (dbName !== to) {
-        changeTableData.changeTableAst.shape[config.snakeCase ? dbName === orchidCore.toSnakeCase(codeKey) ? codeKey : dbName : dbName] = {
+        changeTableData.changeTableAst.shape[config.snakeCase ? dbName === pqb.toSnakeCase(codeKey) ? codeKey : dbName : dbName] = {
           type: "rename",
-          name: config.snakeCase ? to === orchidCore.toSnakeCase(codeKey) ? codeKey : to : to
+          name: config.snakeCase ? to === pqb.toSnakeCase(codeKey) ? codeKey : to : to
         };
       }
     }
@@ -445,15 +444,15 @@ const compareColumns = async (adapter, domainsMap, ast, currentSchema, compareSq
     const dbBaseType = pqb.getColumnBaseType(dbColumn, domainsMap, dbType);
     const codeBaseType = pqb.getColumnBaseType(codeColumn, domainsMap, codeType);
     if (!typeCasts.get(dbBaseType)?.has(codeBaseType)) {
-      if (!(dbColumn instanceof pqb.EnumColumn) || !(codeColumn instanceof pqb.EnumColumn) || !orchidCore.deepCompare(dbColumn.options, codeColumn.options)) {
+      if (!(dbColumn instanceof pqb.EnumColumn) || !(codeColumn instanceof pqb.EnumColumn) || !pqb.deepCompare(dbColumn.options, codeColumn.options)) {
         if (verifying) throw new AbortSignal();
         const tableName = rakeDb.concatSchemaAndName(changeTableData.changeTableAst);
         const abort = await rakeDb.promptSelect({
           message: `Cannot cast type of ${tableName}'s column ${key} from ${dbType} to ${codeType}`,
           options: [
-            `${orchidCore.colors.yellowBold(
+            `${pqb.colors.yellowBold(
               `-/+`
-            )} recreate the column, existing data will be ${orchidCore.colors.red(
+            )} recreate the column, existing data will be ${pqb.colors.red(
               "lost"
             )}`,
             `write migration manually`
@@ -496,7 +495,7 @@ const compareColumns = async (adapter, domainsMap, ast, currentSchema, compareSq
       }
     }
   }
-  if (!orchidCore.deepCompare(
+  if (!pqb.deepCompare(
     dbData.identity,
     codeData.identity ? {
       always: false,
@@ -684,7 +683,7 @@ const processDomains = async (ast, adapter, domainsMap, dbStructure, {
       dbColumn
     );
     const found = codeDomains.filter(
-      (codeDomain) => orchidCore.deepCompare(dbDomain.compare, codeDomain.compare)
+      (codeDomain) => pqb.deepCompare(dbDomain.compare, codeDomain.compare)
     );
     if ((domain.default || domain.checks?.length) && found.length) {
       for (const codeDomain of found) {
@@ -792,7 +791,7 @@ const pushCompareChecks = (compare, domain, found) => {
     const inCode = found.flatMap(
       (codeDomain) => codeDomain.column.data.checks?.map(
         (check) => typeof check === "string" ? check : check.sql
-      ) || orchidCore.emptyArray
+      ) || pqb.emptyArray
     );
     compare.push(
       ...domain.checks.map((check) => ({
@@ -986,7 +985,7 @@ const changePrimaryKey = (config, columnsPrimaryKey, {
       ...columnsPrimaryKey,
       ...(config.snakeCase ? tablePrimaryKey?.columns.map((key) => ({
         key,
-        name: orchidCore.toSnakeCase(key)
+        name: pqb.toSnakeCase(key)
       })) : tablePrimaryKey?.columns.map((key) => ({ key, name: key }))) ?? []
     ])
   ];
@@ -995,7 +994,7 @@ const changePrimaryKey = (config, columnsPrimaryKey, {
   )) {
     if (primaryKey.length === 1) {
       const { key } = primaryKey[0];
-      const changes = shape[key] && orchidCore.toArray(shape[key]);
+      const changes = shape[key] && pqb.toArray(shape[key]);
       if (changes) {
         for (const change of changes) {
           if (change.type !== "change") continue;
@@ -1231,7 +1230,7 @@ const pushCodeColumnItems = (config, codeItems, columnKey, name, column, key) =>
           ...index,
           options: options.include ? config.snakeCase ? {
             ...options,
-            include: orchidCore.toArray(options.include).map(orchidCore.toSnakeCase)
+            include: pqb.toArray(options.include).map(pqb.toSnakeCase)
           } : options : options,
           columnKeys: [
             {
@@ -1256,12 +1255,12 @@ const pushCodeCompositeItems = (config, codeTable, codeItems, key) => {
     ...items.map((x) => ({
       ...x,
       columns: config.snakeCase ? x.columns.map(
-        (c) => "column" in c ? { ...c, column: orchidCore.toSnakeCase(c.column) } : c
+        (c) => "column" in c ? { ...c, column: pqb.toSnakeCase(c.column) } : c
       ) : x.columns,
       columnKeys: x.columns,
       options: x.options.include && config.snakeCase ? {
         ...x.options,
-        include: orchidCore.toArray(x.options.include).map(orchidCore.toSnakeCase)
+        include: pqb.toArray(x.options.include).map(pqb.toSnakeCase)
       } : x.options,
       includeKeys: x.options.include
     }))
@@ -1278,7 +1277,7 @@ const collectCodeComparableItemsType = (config, codeItems, key) => {
     normalizeItem(codeItem.options);
     return itemToComparable({
       ...codeItem.options,
-      include: codeItem.options.include === void 0 ? void 0 : config.snakeCase ? orchidCore.toArray(codeItem.options.include).map(orchidCore.toSnakeCase) : orchidCore.toArray(codeItem.options.include),
+      include: codeItem.options.include === void 0 ? void 0 : config.snakeCase ? pqb.toArray(codeItem.options.include).map(pqb.toSnakeCase) : pqb.toArray(codeItem.options.include),
       columns: codeItem.columns,
       name: codeItem.options.name,
       columnKeys: codeItem.columnKeys,
@@ -1350,7 +1349,7 @@ const findMatchingItemWithoutSql = (dbItem, codeComparableItems, codeItems, skip
   for (let i = 0; i < codeComparableItems[key].length; i++) {
     if (skipCodeItems[key].has(i)) continue;
     const { columns: codeColumns, ...codeItem } = codeComparableItems[key][i];
-    if (dbColumns.length === codeColumns.length && !dbColumns.some((dbColumn, i2) => !orchidCore.deepCompare(dbColumn, codeColumns[i2]))) {
+    if (dbColumns.length === codeColumns.length && !dbColumns.some((dbColumn, i2) => !pqb.deepCompare(dbColumn, codeColumns[i2]))) {
       let a = dbItemWithoutColumns;
       let b = codeItem;
       const codeName = b.name ?? (key === "indexes" ? rakeDb.getIndexName : rakeDb.getExcludeName)(
@@ -1368,7 +1367,7 @@ const findMatchingItemWithoutSql = (dbItem, codeComparableItems, codeItems, skip
         if (a.language && !b.language) {
           b.language = config.language ?? "english";
         }
-        if (orchidCore.deepCompare(a, b)) {
+        if (pqb.deepCompare(a, b)) {
           found.push(codeItems[key][i]);
           rename.push(
             dbItemWithoutColumns.name !== codeName ? codeName : void 0
@@ -1381,7 +1380,7 @@ const findMatchingItemWithoutSql = (dbItem, codeComparableItems, codeItems, skip
           includeKeys,
           ...codeItemWithoutKeys
         } = codeItem;
-        if (orchidCore.deepCompare(dbItemWithoutColumns, codeItemWithoutKeys)) {
+        if (pqb.deepCompare(dbItemWithoutColumns, codeItemWithoutKeys)) {
           found.push(codeItems[key][i]);
           rename.push(void 0);
         }
@@ -1519,7 +1518,7 @@ const processForeignKeys = (config, ast, changeTables, currentSchema, tableShape
       for (let i = 0; i < codeForeignKeys.length; i++) {
         const codeForeignKey = codeForeignKeys[i];
         const codeReferences = codeForeignKey.references;
-        if (orchidCore.deepCompare(dbReferences, codeReferences)) {
+        if (pqb.deepCompare(dbReferences, codeReferences)) {
           found = true;
           codeForeignKeys.splice(i, 1);
           const codeName = codeForeignKey.codeConstraint.name ?? rakeDb.getConstraintName(
@@ -1633,8 +1632,8 @@ const collectCodeFkeys = (config, { codeTable, changeTableAst: { shape } }, curr
           {
             ...refs,
             fnOrTable,
-            columns: config.snakeCase ? refs.columns.map(orchidCore.toSnakeCase) : refs.columns,
-            foreignColumns: config.snakeCase ? refs.foreignColumns.map(orchidCore.toSnakeCase) : refs.foreignColumns
+            columns: config.snakeCase ? refs.columns.map(pqb.toSnakeCase) : refs.columns,
+            foreignColumns: config.snakeCase ? refs.foreignColumns.map(pqb.toSnakeCase) : refs.foreignColumns
           },
           currentSchema
         )
@@ -1658,7 +1657,7 @@ const parseForeignKey = (config, codeConstraint, references, currentSchema) => {
       foreignSchema: schema ?? currentSchema,
       foreignTable: table,
       columns,
-      foreignColumns: config.snakeCase ? foreignColumns.map(orchidCore.toSnakeCase) : foreignColumns,
+      foreignColumns: config.snakeCase ? foreignColumns.map(pqb.toSnakeCase) : foreignColumns,
       match: mapMatchToDb[options?.match || "SIMPLE"],
       onUpdate: mapActionToDb[options?.onUpdate || "NO ACTION"],
       onDelete: mapActionToDb[options?.onDelete || "NO ACTION"]
@@ -1777,7 +1776,7 @@ const collectCodeChecks = ({
     const baseName = `${codeTable.table}_${columnName}_check`;
     codeChecks.push(
       ...column.data.checks.map((check) => {
-        const name = check.name || orchidCore.getFreeSetAlias(names, baseName, 1);
+        const name = check.name || pqb.getFreeSetAlias(names, baseName, 1);
         names.add(name);
         return {
           check,
@@ -1792,7 +1791,7 @@ const collectCodeChecks = ({
       const { check } = constraint;
       if (check) {
         const baseName = `${codeTable.table}_check`;
-        const name = constraint.name || orchidCore.getFreeSetAlias(names, baseName, 1);
+        const name = constraint.name || pqb.getFreeSetAlias(names, baseName, 1);
         names.add(name);
         codeChecks.push({
           check: { sql: check, name: constraint.name },
@@ -2180,7 +2179,7 @@ const report = (ast, config, currentSchema) => {
   if (typeof config.log === "object" && config.log.colors === false) {
     green = red = yellow = pale = (s) => s;
   } else {
-    ({ green, red, yellow, pale } = orchidCore.colors);
+    ({ green, red, yellow, pale } = pqb.colors);
   }
   for (const a of ast) {
     switch (a.type) {
@@ -2223,7 +2222,7 @@ const report = (ast, config, currentSchema) => {
           const value = counters[key];
           if (value || key === "column") {
             summary.push(
-              `${value} ${orchidCore.pluralize(key, value, key === "index" ? "es" : "s")}`
+              `${value} ${pqb.pluralize(key, value, key === "index" ? "es" : "s")}`
             );
           }
         }
@@ -2245,7 +2244,7 @@ const report = (ast, config, currentSchema) => {
           snakeCase: config.snakeCase
         };
         for (const key in a.shape) {
-          const changes = orchidCore.toArray(a.shape[key]);
+          const changes = pqb.toArray(a.shape[key]);
           for (const change of changes) {
             if (change.type === "add" || change.type === "drop") {
               const column = change.item;
@@ -2259,25 +2258,25 @@ const report = (ast, config, currentSchema) => {
               );
             } else if (change.type === "change") {
               let name = change.from.column?.data.name ?? key;
-              if (config.snakeCase) name = orchidCore.toCamelCase(name);
+              if (config.snakeCase) name = pqb.toCamelCase(name);
               const changes2 = [];
               inner.push(`${yellow("~ change column")} ${name}:`, changes2);
               changes2.push(`${yellow("from")}: `);
               const fromCode = change.from.column.toCode(toCodeCtx, key);
               for (const code2 of fromCode) {
-                orchidCore.addCode(changes2, code2);
+                pqb.addCode(changes2, code2);
               }
               changes2.push(`  ${yellow("to")}: `);
               const toCode = change.to.column.toCode(toCodeCtx, key);
               for (const code2 of toCode) {
-                orchidCore.addCode(changes2, code2);
+                pqb.addCode(changes2, code2);
               }
             } else if (change.type === "rename") {
               inner.push(
-                `${yellow("~ rename column")} ${config.snakeCase ? orchidCore.toCamelCase(key) : key} ${yellow("=>")} ${change.name}`
+                `${yellow("~ rename column")} ${config.snakeCase ? pqb.toCamelCase(key) : key} ${yellow("=>")} ${change.name}`
               );
             } else {
-              orchidCore.exhaustive(change.type);
+              pqb.exhaustive(change.type);
             }
           }
         }
@@ -2464,10 +2463,10 @@ const report = (ast, config, currentSchema) => {
         break;
       }
       default:
-        orchidCore.exhaustive(a);
+        pqb.exhaustive(a);
     }
   }
-  const result = orchidCore.codeToString(code, "", "  ");
+  const result = pqb.codeToString(code, "", "  ");
   config.logger.log(result);
 };
 const dbItemName = ({ schema, name }, currentSchema) => {
@@ -2768,7 +2767,7 @@ const processHasAndBelongsToManyColumn = (column, habtmTables, codeItems) => {
       primaryKey: void 0,
       default: void 0
     };
-    shape[orchidCore.toCamelCase(key)] = column2;
+    shape[pqb.toCamelCase(key)] = column2;
   }
   joinTable.shape = shape;
   joinTable.internal = {
@@ -2795,11 +2794,11 @@ const getTableInfosAndFKeys = (asts, config) => {
   const fkeys = {};
   for (const ast of asts) {
     if (ast.type === "table") {
-      const tableKey = orchidCore.toCamelCase(ast.name);
+      const tableKey = pqb.toCamelCase(ast.name);
       const dbTableName = ast.schema ? `${ast.schema}.${ast.name}` : ast.name;
       let tablePath = path.resolve(config.basePath, generateTableTo(tableKey));
       if (!tablePath.endsWith(".ts")) tablePath += ".ts";
-      const name = orchidCore.toPascalCase(ast.name);
+      const name = pqb.toPascalCase(ast.name);
       const info = {
         dbTableName,
         key: tableKey,
@@ -2825,15 +2824,15 @@ const appCodeGenTable = (tableInfos, fkeys, ast, baseTablePath, baseTableExporte
   const tableInfo = tableInfos[ast.schema ? `${ast.schema}.${ast.name}` : ast.name];
   const imports = {
     "orchid-orm": "Selectable, Insertable, Updatable",
-    [orchidCore.getImportPath(tableInfo.path, baseTablePath)]: baseTableExportedAs
+    [pqb.getImportPath(tableInfo.path, baseTablePath)]: baseTableExportedAs
   };
   const props = [];
   if (ast.schema) {
-    props.push(`schema = ${orchidCore.singleQuote(ast.schema)};`);
+    props.push(`schema = ${pqb.singleQuote(ast.schema)};`);
   }
-  props.push(`readonly table = ${orchidCore.singleQuote(ast.name)};`);
+  props.push(`readonly table = ${pqb.singleQuote(ast.name)};`);
   if (ast.comment) {
-    props.push(`comment = ${orchidCore.singleQuote(ast.comment)};`);
+    props.push(`comment = ${pqb.singleQuote(ast.comment)};`);
   }
   if (ast.noPrimaryKey === "ignore") {
     props.push("noPrimaryKey = true;");
@@ -2858,12 +2857,12 @@ const appCodeGenTable = (tableInfos, fkeys, ast, baseTablePath, baseTableExporte
   const belongsTo = fkeys[fullTableName];
   if (belongsTo) {
     for (const { table, references } of belongsTo) {
-      imports[orchidCore.getImportPath(tableInfo.path, table.path)] = table.className;
+      imports[pqb.getImportPath(tableInfo.path, table.path)] = table.className;
       relations.push(
         `${table.key}: this.belongsTo(() => ${table.className}, {`,
         [
-          `columns: [${references.foreignColumns.map(orchidCore.singleQuote).join(", ")}],`,
-          `references: [${references.columns.map(orchidCore.singleQuote).join(", ")}],`
+          `columns: [${references.foreignColumns.map(pqb.singleQuote).join(", ")}],`,
+          `references: [${references.columns.map(pqb.singleQuote).join(", ")}],`
         ],
         "}),"
       );
@@ -2873,12 +2872,12 @@ const appCodeGenTable = (tableInfos, fkeys, ast, baseTablePath, baseTableExporte
     for (const { references } of ast.constraints) {
       if (!references) continue;
       const table = tableInfos[references.fnOrTable];
-      imports[orchidCore.getImportPath(tableInfo.path, table.path)] = table.className;
+      imports[pqb.getImportPath(tableInfo.path, table.path)] = table.className;
       relations.push(
         `${table.key}: this.hasMany(() => ${table.className}, {`,
         [
-          `columns: [${references.columns.map(orchidCore.singleQuote).join(", ")}],`,
-          `references: [${references.foreignColumns.map(orchidCore.singleQuote).join(", ")}],`
+          `columns: [${references.columns.map(pqb.singleQuote).join(", ")}],`,
+          `references: [${references.foreignColumns.map(pqb.singleQuote).join(", ")}],`
         ],
         "}),"
       );
@@ -2900,7 +2899,7 @@ export class ${className} extends ${baseTableExportedAs} {`,
   ];
   return {
     ...tableInfo,
-    content: importsCode + "\n\n" + orchidCore.codeToString(code, "", "  ")
+    content: importsCode + "\n\n" + pqb.codeToString(code, "", "  ")
   };
 };
 function importsToCode(imports) {
@@ -2926,14 +2925,14 @@ const appCodeGenUpdateDbFile = async (dbPath, tables, extensions, domains, curre
     if (extensions.length) {
       code += `
   extensions: [${extensions.map(
-        (ext) => ext.version ? `{ ${orchidCore.quoteObjectKey(ext.name, false)}: '${ext.version}' }` : orchidCore.singleQuote(ext.name)
+        (ext) => ext.version ? `{ ${pqb.quoteObjectKey(ext.name, false)}: '${ext.version}' }` : pqb.singleQuote(ext.name)
       ).join(", ")}],`;
     }
     if (domains.length) {
       code += `
   domains: {
     ${domains.sort((a, b) => a.name > b.name ? 1 : -1).map(
-        (ast) => `${orchidCore.quoteObjectKey(
+        (ast) => `${pqb.quoteObjectKey(
           ast.schema ? `${ast.schema}.${ast.name}` : ast.name,
           false
         )}: (t) => ${ast.baseType.toCode(
@@ -3001,7 +3000,7 @@ const makeTablesListChanges = (content, statements, object, tables, dbPath) => {
   const tablesArr = Object.values(tables);
   for (let i = 0; i < tablesArr.length; i++) {
     const { path, className, key } = tablesArr[i];
-    const importPath = orchidCore.getImportPath(dbPath, path);
+    const importPath = pqb.getImportPath(dbPath, path);
     imports += `
 import { ${className} } from '${importPath}';`;
     tablesList += `${i === 0 && prependComma ? "," : ""}
@@ -3141,7 +3140,7 @@ const pull = async (adapters, config) => {
   await Promise.all(
     pendingFileWrites.map(
       ([path2, content2, options]) => fs.writeFile(path2, content2, options).then(() => {
-        config.logger?.log(`Created ${orchidCore.pathToLog(path2)}`);
+        config.logger?.log(`Created ${pqb.pathToLog(path2)}`);
       })
     )
   );