orchid-orm 1.4.20 → 1.4.22

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # orchid-orm
 
+## 1.4.22
+
+### Patch Changes
+
+- Change inner aspects of columns
+- Updated dependencies
+  - pqb@0.8.5
+
+## 1.4.21
+
+### Patch Changes
+
+- Add --code cli argument to rake-db
+- Improve codegen
+- Updated dependencies
+- Updated dependencies
+  - pqb@0.8.4
+
 ## 1.4.19
 
 ### Patch Changes

package/dist/index.esm.js

@@ -1567,8 +1567,38 @@ const getImportPath = (from, to) => {
 
 const libraryName = "orchid-orm";
 const importKey = "orchidORM";
-const updateMainFile = async (path, tablePath, ast) => {
-  const content = await fs.readFile(path, "utf-8");
+const newFile = (options) => `import { orchidORM } from 'orchid-orm';
+
+export const db = orchidORM(
+  {
+    ${optionsToString(options)}
+  },
+  {
+  }
+);
+`;
+const optionsToString = (options) => {
+  const lines = [];
+  for (const key in options) {
+    const value = options[key];
+    if (typeof value !== "object" && typeof value !== "function") {
+      lines.push(
+        `${key}: ${typeof value === "string" ? singleQuote(value) : value},`
+      );
+    }
+  }
+  return lines.join("\n    ");
+};
+const updateMainFile = async (filePath, tablePath, ast, options) => {
+  const result = await fs.readFile(filePath, "utf-8").then(
+    (content2) => ({ error: void 0, content: content2 }),
+    (error) => {
+      return { error, content: void 0 };
+    }
+  );
+  if (result.error && result.error.code !== "ENOENT")
+    throw result.error;
+  const content = result.content || newFile(options);
   const statements = ts.getStatements(content);
   const importName = ts.import.getStatementsImportedName(
     statements,
@@ -1586,26 +1616,33 @@ const updateMainFile = async (path, tablePath, ast) => {
   }
   const spaces = ts.spaces.getAtLine(content, object.end);
   const context = {
-    path,
+    filePath,
     tablePath,
     statements,
     object,
     content,
     spaces
   };
+  let write;
   if (ast.type === "table") {
     if (ast.action === "create") {
-      return fs.writeFile(path, createTable$1(context, ast));
+      write = createTable$1(context, ast);
     } else {
-      return fs.writeFile(path, dropTable(context, ast));
+      write = dropTable(context, ast);
     }
   }
+  if (write) {
+    if (result.error) {
+      await fs.mkdir(path__default.dirname(filePath), { recursive: true });
+    }
+    await fs.writeFile(filePath, write);
+  }
 };
-const createTable$1 = ({ path, tablePath, statements, object, content, spaces }, ast) => {
+const createTable$1 = ({ filePath, tablePath, statements, object, content, spaces }, ast) => {
   const key = toCamelCase(ast.name);
   const value = toPascalCase(ast.name);
   const changes = new FileChanges(content);
-  const importPath = getImportPath(path, tablePath(ast.name));
+  const importPath = getImportPath(filePath, tablePath(ast.name));
   const importPos = ts.import.getEndPos(statements);
   changes.add(
     importPos,
@@ -1623,9 +1660,9 @@ ${spaces}`;
   changes.add(object.properties.end, insert);
   return changes.apply();
 };
-const dropTable = ({ path, tablePath, statements, object, content }, ast) => {
+const dropTable = ({ filePath, tablePath, statements, object, content }, ast) => {
   const changes = new FileChanges(content);
-  const importPath = getImportPath(path, tablePath(ast.name));
+  const importPath = getImportPath(filePath, tablePath(ast.name));
   const tableClassName = toPascalCase(ast.name);
   const importNames = [];
   for (const node of ts.import.iterateWithSource(statements, importPath)) {
@@ -1690,7 +1727,11 @@ const createTable = async (_a) => {
   ]);
   const tablePath = params.tablePath(ast.name);
   const baseTablePath = getImportPath(tablePath, params.baseTablePath);
-  const props = [`table = ${singleQuote(ast.name)};`];
+  const props = [];
+  if (ast.schema) {
+    props.push(`schema = ${singleQuote(ast.schema)};`);
+  }
+  props.push(`table = ${singleQuote(ast.name)};`);
   if (ast.noPrimaryKey === "ignore") {
     props.push("noPrimaryKey = true;");
   }
@@ -1704,8 +1745,9 @@ const createTable = async (_a) => {
 `,
     `export class ${toPascalCase(ast.name)} extends ${params.baseTableName} {`,
     props,
-    "}"
+    "}\n"
   ];
+  await fs.mkdir(path__default.dirname(tablePath), { recursive: true });
   await fs.writeFile(tablePath, codeToString(code, "", "  "));
 };
 
@@ -2132,17 +2174,38 @@ const renameTable = async (_a) => {
   const changes = new FileChanges(content);
   const statements = ts.getStatements(content);
   const className = toPascalCase(ast.from);
+  const changeSchema = ast.fromSchema !== ast.toSchema;
   for (const node of ts.class.iterate(statements)) {
     if (((_a2 = node.name) == null ? void 0 : _a2.escapedText) !== className)
       continue;
+    const addSchema = changeSchema && ast.toSchema && !node.members.some((member) => ts.prop.getName(member) === "schema");
+    if (addSchema && ast.toSchema) {
+      changes.add(
+        node.members.pos,
+        `
+  schema = ${singleQuote(ast.toSchema)};`
+      );
+    }
     for (const member of node.members) {
       const name = ts.prop.getName(member);
-      if (name !== "table")
+      if (name !== "table" && !(changeSchema && name === "schema"))
         continue;
       const { initializer: value } = member;
       if (!value)
         continue;
-      changes.replace(value.pos, value.end, ` ${singleQuote(ast.to)}`);
+      if (name === "schema") {
+        if (ast.toSchema) {
+          changes.replace(
+            value.pos,
+            value.end,
+            ` ${singleQuote(ast.toSchema)}`
+          );
+        } else {
+          changes.remove(member.pos, member.end);
+        }
+      } else {
+        changes.replace(value.pos, value.end, ` ${singleQuote(ast.to)}`);
+      }
     }
   }
   await fs.writeFile(params.tablePath(ast.to), changes.apply());
@@ -2178,6 +2241,32 @@ const updateTableFile = async (params) => {
   }
 };
 
+const createBaseTableFile = async ({
+  baseTableName,
+  baseTablePath
+}) => {
+  await fs.mkdir(path__default.dirname(baseTablePath), { recursive: true });
+  await fs.writeFile(
+    baseTablePath,
+    `import { createBaseTable } from 'orchid-orm';
+import { columnTypes } from 'pqb';
+
+export const ${baseTableName} = createBaseTable({
+  columnTypes: {
+    ...columnTypes,
+  },
+});
+`,
+    {
+      flag: "wx"
+    }
+  ).catch((err) => {
+    if (err.code === "EEXIST")
+      return;
+    throw err;
+  });
+};
+
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
@@ -2204,11 +2293,20 @@ const appCodeUpdater = (config) => {
     tablePath: (name) => path.resolve(config.tablePath(name)),
     mainFilePath: path.resolve(config.mainFilePath)
   });
-  return async (ast) => {
-    await Promise.all([
-      updateMainFile(params.mainFilePath, params.tablePath, ast),
+  return async ({ ast, options, cache: cacheObject }) => {
+    const promises = [
+      updateMainFile(params.mainFilePath, params.tablePath, ast, options),
       updateTableFile(__spreadProps(__spreadValues({}, params), { ast }))
-    ]);
+    ];
+    const cache = cacheObject;
+    if (!cache.createdBaseTable) {
+      promises.push(
+        createBaseTableFile(params).then(() => {
+          cache.createdBaseTable = true;
+        })
+      );
+    }
+    await Promise.all(promises);
   };
 };